From 0a843ff84210b7a902eb450f7f5ca36489a3e3a4 Mon Sep 17 00:00:00 2001
From: Lord_Alfred <2259979+lord-alfred@users.noreply.github.com>
Date: Thu, 29 Jul 2021 23:49:00 +0300
Subject: [PATCH] fix unique ips & add ipv6 merges

---
 .github/workflows/update.yml | 4 ++++
 amazon/downloader.sh         | 4 ++--
 google/downloader.sh         | 5 +++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index 40116546..b7d8c1ef 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -36,8 +36,12 @@ jobs:
       - name: Merge IPv4 ranges
         run: |
           set -euo pipefail
+          # 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
+          # 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
 
       - name: Commit files
         env:
diff --git a/amazon/downloader.sh b/amazon/downloader.sh
index 6bd1cf01..6822738e 100755
--- a/amazon/downloader.sh
+++ b/amazon/downloader.sh
@@ -18,5 +18,5 @@ jq '.ipv6_prefixes[] | [.ipv6_prefix][] | select(. != null)' -r /tmp/amazon.json
 
 
 # sort & uniq
-sort -hu /tmp/amazon-ipv4.txt > amazon/ipv4.txt
-sort -hu /tmp/amazon-ipv6.txt > amazon/ipv6.txt
+sort -h /tmp/amazon-ipv4.txt | uniq > amazon/ipv4.txt
+sort -h /tmp/amazon-ipv6.txt | uniq > amazon/ipv6.txt
diff --git a/google/downloader.sh b/google/downloader.sh
index 617bbf59..17740044 100755
--- a/google/downloader.sh
+++ b/google/downloader.sh
@@ -10,6 +10,7 @@ set -euo pipefail
 set -x
 
 
+
 # get from public ranges
 curl -s https://www.gstatic.com/ipranges/goog.txt > /tmp/goog.txt
 curl -s https://www.gstatic.com/ipranges/cloud.json > /tmp/cloud.json
@@ -52,5 +53,5 @@ grep ':' /tmp/netblocks.txt >> /tmp/google-ipv6.txt
 
 
 # sort & uniq
-sort -hu /tmp/google-ipv4.txt > google/ipv4.txt
-sort -hu /tmp/google-ipv6.txt > google/ipv6.txt
+sort -h /tmp/google-ipv4.txt | uniq > google/ipv4.txt
+sort -h /tmp/google-ipv6.txt | uniq > google/ipv6.txt