gfwlist & chinalist: remove root domain (#46)

Related: #44 and #45.
pexcn · May 29, 2020 · b031ec2 · b031ec2
1 parent 48eaff4
commit b031ec2
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 248 deletions.
diff --git a/scripts/_post_/02-tldlist.sh b/scripts/_post_/02-tldlist.sh
diff --git a/scripts/_post_/03-root-domain.sh b/scripts/_post_/03-root-domain.sh
diff --git a/scripts/_pre_/02-tldlist.sh b/scripts/_pre_/02-tldlist.sh
diff --git a/scripts/chinalist/chinalist.sh b/scripts/chinalist/chinalist.sh
@@ -7,20 +7,17 @@ TMP_DIR=$(mktemp -d /tmp/chinalist.XXXXXX)
 SRC_URL_1="https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/apple.china.conf"
 SRC_URL_2="https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/google.china.conf"
 SRC_URL_3="https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/accelerated-domains.china.conf"
-SRC_FILE_1="$CUR_DIR/dist/toplist/toplist.txt"
-SRC_FILE_2="$CUR_DIR/dist/tldlist/tldlist.txt"
+SRC_FILE="$CUR_DIR/dist/toplist/toplist.txt"
 DEST_FILE_1="dist/chinalist/chinalist.txt"
 DEST_FILE_2="dist/chinalist/chinalist-lite.txt"
-DEST_FILE_3="dist/chinalist/chinalist-root.txt"
 
 fetch_src() {
   cd $TMP_DIR
 
   curl -sSL $SRC_URL_1 -o apple.conf
   curl -sSL $SRC_URL_2 -o google.conf
   curl -sSL $SRC_URL_3 -o china.conf
-  cp $SRC_FILE_1 .
-  cp $SRC_FILE_2 .
+  cp $SRC_FILE .
 
   cd $CUR_DIR
 }
@@ -50,18 +47,12 @@ gen_list() {
   # lite version
   cat chinalist_head.tmp > chinalist-lite.txt
 
-  # root domain version
-  local tlds_regex=$(cat tldlist.txt | tr '\n' '|' | sed '$ s/.$//')
-  local root_domain_regex="([^\.]+)\.($tlds_regex)$"
-  grep -Po $root_domain_regex chinalist.txt | awk '!x[$0]++' > chinalist-root.txt
-
   cd $CUR_DIR
 }
 
 copy_dest() {
   install -D -m 644 $TMP_DIR/chinalist.txt $DEST_FILE_1
   install -D -m 644 $TMP_DIR/chinalist-lite.txt $DEST_FILE_2
-  install -D -m 644 $TMP_DIR/chinalist-root.txt $DEST_FILE_3
 }
 
 clean_up() {

diff --git a/scripts/gfwlist/gfwlist.sh b/scripts/gfwlist/gfwlist.sh
@@ -6,18 +6,15 @@ TMP_DIR=$(mktemp -d /tmp/gfwlist.XXXXXX)
 
 SRC_URL_1="https://raw.githubusercontent.com/gfwlist/gfwlist/master/gfwlist.txt"
 SRC_URL_2="https://raw.githubusercontent.com/pexcn/gfwlist-extras/master/gfwlist-extras.txt"
-SRC_FILE_1="$CUR_DIR/dist/toplist/toplist.txt"
-SRC_FILE_2="$CUR_DIR/dist/tldlist/tldlist.txt"
-DEST_FILE_1="dist/gfwlist/gfwlist.txt"
-DEST_FILE_2="dist/gfwlist/gfwlist-root.txt"
+SRC_FILE="$CUR_DIR/dist/toplist/toplist.txt"
+DEST_FILE="dist/gfwlist/gfwlist.txt"
 
 fetch_src() {
   cd $TMP_DIR
 
   curl -sSL $SRC_URL_1 | base64 -d > gfwlist-plain.txt
   curl -sSL $SRC_URL_2 -o gfwlist-extras.txt
-  cp $SRC_FILE_1 .
-  cp $SRC_FILE_2 .
+  cp $SRC_FILE .
 
   cd $CUR_DIR
 }
@@ -50,17 +47,11 @@ gen_list() {
   # merge to gfwlist
   cat gfwlist_head.tmp gfwlist_tail.tmp > gfwlist.txt
 
-  # root domain version
-  local tlds_regex=$(cat tldlist.txt | tr '\n' '|' | sed '$ s/.$//')
-  local root_domain_regex="([^\.]+)\.($tlds_regex)$"
-  grep -Po $root_domain_regex gfwlist.txt | awk '!x[$0]++' > gfwlist-root.txt
-
   cd $CUR_DIR
 }
 
 copy_dest() {
-  install -D -m 644 $TMP_DIR/gfwlist.txt $DEST_FILE_1
-  install -D -m 644 $TMP_DIR/gfwlist-root.txt $DEST_FILE_2
+  install -D -m 644 $TMP_DIR/gfwlist.txt $DEST_FILE
 }
 
 clean_up() {

diff --git a/template/tld-extras.txt b/template/tld-extras.txt