diff --git a/generate.sh b/generate.sh index 5ba4c845..d0dd8a3f 100755 --- a/generate.sh +++ b/generate.sh @@ -8,14 +8,8 @@ for file in operator/*.conf; do operator=${file%.*} operator=${operator##*/} log_info "generating IP list of $operator ..." - get_asn $file | tee /dev/stderr | xargs bgptools -b rib.txt | sort | uniq | docker run -i --rm yangzhaofengsteven/cidr-merge > result/$operator.txt - log_info "done" + get_asn $file + get_asn $file | xargs bgptools -b rib.txt | sort | uniq | docker run -i --rm yangzhaofengsteven/cidr-merge > result/${operator}.txt + get_asn $file | xargs bgptools -b rib6.txt | sort | uniq | docker run -i --rm yangzhaofengsteven/cidr-merge > result/${operator}6.txt done -for file in operator6/*.conf; do - operator=${file%.*} - operator=${operator##*/} - log_info "generating IPv6 list of $operator ..." - get_asn $file | tee /dev/stderr | xargs bgptools -b rib6.txt | sort | uniq | docker run -i --rm yangzhaofengsteven/cidr-merge > result/${operator}6.txt - log_info "done" -done diff --git a/operator/cernet.conf b/operator/cernet.conf index 4d1dbb6c..f6fbd173 100644 --- a/operator/cernet.conf +++ b/operator/cernet.conf @@ -1,2 +1,2 @@ -PATTERN='cernet' +PATTERN='(cngi|cernet)' COUNTRY='CN' diff --git a/operator6/cernet.conf b/operator6/cernet.conf deleted file mode 100644 index f6fbd173..00000000 --- a/operator6/cernet.conf +++ /dev/null @@ -1,2 +0,0 @@ -PATTERN='(cngi|cernet)' -COUNTRY='CN' diff --git a/operator6/china.conf b/operator6/china.conf deleted file mode 120000 index be88440d..00000000 --- a/operator6/china.conf +++ /dev/null @@ -1 +0,0 @@ -../operator/china.conf \ No newline at end of file diff --git a/operator6/chinanet.conf b/operator6/chinanet.conf deleted file mode 120000 index 868d70fd..00000000 --- a/operator6/chinanet.conf +++ /dev/null @@ -1 +0,0 @@ -../operator/chinanet.conf \ No newline at end of file diff --git a/operator6/cmcc.conf b/operator6/cmcc.conf deleted file mode 120000 index 0213d77f..00000000 --- a/operator6/cmcc.conf +++ /dev/null @@ -1 +0,0 @@ -../operator/cmcc.conf \ No newline at end of file diff --git a/operator6/cstnet.conf b/operator6/cstnet.conf deleted file mode 120000 index b9311d1f..00000000 --- a/operator6/cstnet.conf +++ /dev/null @@ -1 +0,0 @@ -../operator/cstnet.conf \ No newline at end of file diff --git a/operator6/drpeng.conf b/operator6/drpeng.conf deleted file mode 120000 index 5b94196d..00000000 --- a/operator6/drpeng.conf +++ /dev/null @@ -1 +0,0 @@ -../operator/drpeng.conf \ No newline at end of file diff --git a/operator6/tietong.conf b/operator6/tietong.conf deleted file mode 120000 index 8631c2c8..00000000 --- a/operator6/tietong.conf +++ /dev/null @@ -1 +0,0 @@ -../operator/tietong.conf \ No newline at end of file diff --git a/operator6/unicom.conf b/operator6/unicom.conf deleted file mode 120000 index ff643b3d..00000000 --- a/operator6/unicom.conf +++ /dev/null @@ -1 +0,0 @@ -../operator/unicom.conf \ No newline at end of file