Fix ip sorting

.github/workflows/update.yml

@@ -33,8 +33,8 @@ jobs:
 
       - name: Create All-In-One ranges
         run: |
-          cat google/ipv4.txt amazon/ipv4.txt microsoft/ipv4.txt oracle/ipv4.txt digitalocean/ipv4.txt bing/ipv4.txt github/ipv4.txt facebook/ipv4.txt twitter/ipv4.txt linode/ipv4.txt telegram/ipv4.txt openai/ipv4.txt | sort -h | uniq > all/ipv4.txt
-          cat google/ipv6.txt amazon/ipv6.txt microsoft/ipv6.txt digitalocean/ipv6.txt github/ipv6.txt facebook/ipv6.txt twitter/ipv6.txt linode/ipv6.txt telegram/ipv6.txt | sort -h | uniq > all/ipv6.txt
+          cat google/ipv4.txt amazon/ipv4.txt microsoft/ipv4.txt oracle/ipv4.txt digitalocean/ipv4.txt bing/ipv4.txt github/ipv4.txt facebook/ipv4.txt twitter/ipv4.txt linode/ipv4.txt telegram/ipv4.txt openai/ipv4.txt | sort -V | uniq > all/ipv4.txt
+          cat google/ipv6.txt amazon/ipv6.txt microsoft/ipv6.txt digitalocean/ipv6.txt github/ipv6.txt facebook/ipv6.txt twitter/ipv6.txt linode/ipv6.txt telegram/ipv6.txt | sort -V | uniq > all/ipv6.txt
 
       - name: Set up Python 3.7
         uses: actions/setup-python@v2
@@ -59,32 +59,32 @@ jobs:
           set -euo pipefail
           set -x
           # ipv4
-          python utils/merge.py --source=google/ipv4.txt | sort -h > google/ipv4_merged.txt
-          python utils/merge.py --source=amazon/ipv4.txt | sort -h > amazon/ipv4_merged.txt
-          python utils/merge.py --source=microsoft/ipv4.txt | sort -h > microsoft/ipv4_merged.txt
-          python utils/merge.py --source=oracle/ipv4.txt | sort -h > oracle/ipv4_merged.txt
-          python utils/merge.py --source=digitalocean/ipv4.txt | sort -h > digitalocean/ipv4_merged.txt
-          python utils/merge.py --source=bing/ipv4.txt | sort -h > bing/ipv4_merged.txt
-          python utils/merge.py --source=github/ipv4.txt | sort -h > github/ipv4_merged.txt
-          python utils/merge.py --source=facebook/ipv4.txt | sort -h > facebook/ipv4_merged.txt
-          python utils/merge.py --source=twitter/ipv4.txt | sort -h > twitter/ipv4_merged.txt
-          python utils/merge.py --source=linode/ipv4.txt | sort -h > linode/ipv4_merged.txt
-          python utils/merge.py --source=telegram/ipv4.txt | sort -h > telegram/ipv4_merged.txt
-          python utils/merge.py --source=openai/ipv4.txt | sort -h > openai/ipv4_merged.txt
-          python utils/merge.py --source=all/ipv4.txt | sort -h > all/ipv4_merged.txt
+          python utils/merge.py --source=google/ipv4.txt | sort -V > google/ipv4_merged.txt
+          python utils/merge.py --source=amazon/ipv4.txt | sort -V > amazon/ipv4_merged.txt
+          python utils/merge.py --source=microsoft/ipv4.txt | sort -V > microsoft/ipv4_merged.txt
+          python utils/merge.py --source=oracle/ipv4.txt | sort -V > oracle/ipv4_merged.txt
+          python utils/merge.py --source=digitalocean/ipv4.txt | sort -V > digitalocean/ipv4_merged.txt
+          python utils/merge.py --source=bing/ipv4.txt | sort -V > bing/ipv4_merged.txt
+          python utils/merge.py --source=github/ipv4.txt | sort -V > github/ipv4_merged.txt
+          python utils/merge.py --source=facebook/ipv4.txt | sort -V > facebook/ipv4_merged.txt
+          python utils/merge.py --source=twitter/ipv4.txt | sort -V > twitter/ipv4_merged.txt
+          python utils/merge.py --source=linode/ipv4.txt | sort -V > linode/ipv4_merged.txt
+          python utils/merge.py --source=telegram/ipv4.txt | sort -V > telegram/ipv4_merged.txt
+          python utils/merge.py --source=openai/ipv4.txt | sort -V > openai/ipv4_merged.txt
+          python utils/merge.py --source=all/ipv4.txt | sort -V > all/ipv4_merged.txt
           # ipv6
-          python utils/merge.py --source=google/ipv6.txt | sort -h > google/ipv6_merged.txt
-          python utils/merge.py --source=amazon/ipv6.txt | sort -h > amazon/ipv6_merged.txt
-          python utils/merge.py --source=microsoft/ipv6.txt | sort -h > microsoft/ipv6_merged.txt
+          python utils/merge.py --source=google/ipv6.txt | sort -V > google/ipv6_merged.txt
+          python utils/merge.py --source=amazon/ipv6.txt | sort -V > amazon/ipv6_merged.txt
+          python utils/merge.py --source=microsoft/ipv6.txt | sort -V > microsoft/ipv6_merged.txt
           # oracle not provide ipv6
-          python utils/merge.py --source=digitalocean/ipv6.txt | sort -h > digitalocean/ipv6_merged.txt
+          python utils/merge.py --source=digitalocean/ipv6.txt | sort -V > digitalocean/ipv6_merged.txt
           # bing not provide ipv6
-          python utils/merge.py --source=github/ipv6.txt | sort -h > github/ipv6_merged.txt
-          python utils/merge.py --source=facebook/ipv6.txt | sort -h > facebook/ipv6_merged.txt
-          python utils/merge.py --source=twitter/ipv6.txt | sort -h > twitter/ipv6_merged.txt
-          python utils/merge.py --source=linode/ipv6.txt | sort -h > linode/ipv6_merged.txt
-          python utils/merge.py --source=telegram/ipv6.txt | sort -h > telegram/ipv6_merged.txt
-          python utils/merge.py --source=all/ipv6.txt | sort -h > all/ipv6_merged.txt
+          python utils/merge.py --source=github/ipv6.txt | sort -V > github/ipv6_merged.txt
+          python utils/merge.py --source=facebook/ipv6.txt | sort -V > facebook/ipv6_merged.txt
+          python utils/merge.py --source=twitter/ipv6.txt | sort -V > twitter/ipv6_merged.txt
+          python utils/merge.py --source=linode/ipv6.txt | sort -V > linode/ipv6_merged.txt
+          python utils/merge.py --source=telegram/ipv6.txt | sort -V > telegram/ipv6_merged.txt
+          python utils/merge.py --source=all/ipv6.txt | sort -V > all/ipv6_merged.txt
           # openai not provide ipv6
 
       - name: Commit files

amazon/downloader.sh

@@ -18,5 +18,5 @@ jq '.ipv6_prefixes[] | [.ipv6_prefix][] | select(. != null)' -r /tmp/amazon.json
 
 
 # sort & uniq
-sort -h /tmp/amazon-ipv4.txt | uniq > amazon/ipv4.txt
-sort -h /tmp/amazon-ipv6.txt | uniq > amazon/ipv6.txt
+sort -V /tmp/amazon-ipv4.txt | uniq > amazon/ipv4.txt
+sort -V /tmp/amazon-ipv6.txt | uniq > amazon/ipv6.txt

bing/downloader.sh

@@ -22,4 +22,4 @@ jq '.prefixes[] | [.ipv4Prefix][] | select(. != null)' -r /tmp/bing.json > /tmp/
 
 
 # sort & uniq
-sort -h /tmp/bing-ipv4.txt | uniq > bing/ipv4.txt
+sort -V /tmp/bing-ipv4.txt | uniq > bing/ipv4.txt

digitalocean/downloader.sh

@@ -18,5 +18,5 @@ grep ':' /tmp/digitalocean.txt > /tmp/digitalocean-ipv6.txt
 
 
 # sort & uniq
-sort -h /tmp/digitalocean-ipv4.txt | uniq > digitalocean/ipv4.txt
-sort -h /tmp/digitalocean-ipv6.txt | uniq > digitalocean/ipv6.txt
+sort -V /tmp/digitalocean-ipv4.txt | uniq > digitalocean/ipv4.txt
+sort -V /tmp/digitalocean-ipv6.txt | uniq > digitalocean/ipv6.txt

facebook/downloader.sh

@@ -32,5 +32,5 @@ grep ':' /tmp/facebook.txt > /tmp/facebook-ipv6.txt
 
 
 # sort & uniq
-sort -h /tmp/facebook-ipv4.txt | uniq > facebook/ipv4.txt
-sort -h /tmp/facebook-ipv6.txt | uniq > facebook/ipv6.txt
+sort -V /tmp/facebook-ipv4.txt | uniq > facebook/ipv4.txt
+sort -V /tmp/facebook-ipv6.txt | uniq > facebook/ipv6.txt

github/downloader.sh

@@ -22,5 +22,5 @@ grep ':' /tmp/github-all.txt > /tmp/github-ipv6.txt
 
 
 # sort & uniq
-sort -h /tmp/github-ipv4.txt | uniq > github/ipv4.txt
-sort -h /tmp/github-ipv6.txt | uniq > github/ipv6.txt
+sort -V /tmp/github-ipv4.txt | uniq > github/ipv4.txt
+sort -V /tmp/github-ipv6.txt | uniq > github/ipv6.txt

google/downloader.sh

@@ -59,5 +59,5 @@ grep ':' /tmp/netblocks.txt >> /tmp/google-ipv6.txt
 
 
 # sort & uniq
-sort -h /tmp/google-ipv4.txt | uniq > google/ipv4.txt
-sort -h /tmp/google-ipv6.txt | uniq > google/ipv6.txt
+sort -V /tmp/google-ipv4.txt | uniq > google/ipv4.txt
+sort -V /tmp/google-ipv6.txt | uniq > google/ipv6.txt

linode/downloader.sh

@@ -18,5 +18,5 @@ grep ':' /tmp/linode.txt > /tmp/linode-ipv6.txt
 
 
 # sort & uniq
-sort -h /tmp/linode-ipv4.txt | uniq > linode/ipv4.txt
-sort -h /tmp/linode-ipv6.txt | uniq > linode/ipv6.txt
+sort -V /tmp/linode-ipv4.txt | uniq > linode/ipv4.txt
+sort -V /tmp/linode-ipv6.txt | uniq > linode/ipv6.txt

microsoft/downloader.sh

@@ -32,5 +32,5 @@ download_and_parse "57062"
 
 
 # sort & uniq
-sort -h /tmp/microsoft-ipv4.txt | uniq > microsoft/ipv4.txt
-sort -h /tmp/microsoft-ipv6.txt | uniq > microsoft/ipv6.txt
+sort -V /tmp/microsoft-ipv4.txt | uniq > microsoft/ipv4.txt
+sort -V /tmp/microsoft-ipv6.txt | uniq > microsoft/ipv6.txt

openai/downloader.sh

@@ -17,4 +17,4 @@ grep -v ':' /tmp/openai.txt > /tmp/openai-ipv4.txt
 
 
 # sort & uniq
-sort -h /tmp/openai-ipv4.txt | uniq > openai/ipv4.txt
+sort -V /tmp/openai-ipv4.txt | uniq > openai/ipv4.txt

oracle/downloader.sh

@@ -18,4 +18,4 @@ jq '.regions[] | [.cidrs][] | .[].cidr | select(. != null)' -r /tmp/oracle.json
 
 
 # sort & uniq
-sort -h /tmp/oracle-ipv4.txt | uniq > oracle/ipv4.txt
+sort -V /tmp/oracle-ipv4.txt | uniq > oracle/ipv4.txt

telegram/downloader.sh

@@ -7,5 +7,5 @@ set -x
 curl -s https://core.telegram.org/resources/cidr.txt > /tmp/telegram.txt
 
 # seperate IPv4 and IPv6, sort an uniq
-grep -v ':' /tmp/telegram.txt | sort -h | uniq > telegram/ipv4.txt
-grep ':' /tmp/telegram.txt | sort -h | uniq > telegram/ipv6.txt
+grep -v ':' /tmp/telegram.txt | sort -V | uniq > telegram/ipv4.txt
+grep ':' /tmp/telegram.txt | sort -V | uniq > telegram/ipv6.txt

twitter/downloader.sh

@@ -32,5 +32,5 @@ grep ':' /tmp/twitter.txt > /tmp/twitter-ipv6.txt
 
 
 # sort & uniq
-sort -h /tmp/twitter-ipv4.txt | uniq > twitter/ipv4.txt
-sort -h /tmp/twitter-ipv6.txt | uniq > twitter/ipv6.txt
+sort -V /tmp/twitter-ipv4.txt | uniq > twitter/ipv4.txt
+sort -V /tmp/twitter-ipv6.txt | uniq > twitter/ipv6.txt