From 4a0b45ea04f191a2f0287c360729572893452368 Mon Sep 17 00:00:00 2001 From: actions-user Date: Wed, 29 Jan 2025 20:41:48 +0800 Subject: [PATCH] update 2025-01-29 20:41:48 --- .../root/usr/share/bypass/update | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/luci-app-bypass/luci-app-bypass/root/usr/share/bypass/update b/luci-app-bypass/luci-app-bypass/root/usr/share/bypass/update index 88b2c94c..3940234f 100644 --- a/luci-app-bypass/luci-app-bypass/root/usr/share/bypass/update +++ b/luci-app-bypass/luci-app-bypass/root/usr/share/bypass/update @@ -12,8 +12,9 @@ chnroute6_url=$(uci -q get bypass.@global_rules[0].chnroute6_url) domains_url=$(uci -q get bypass.@global_rules[0].domains_url) gfwlist_url="$(uci -q get bypass.@global_rules[0].gfwlist_url)" ad_url="$(uci -q get bypass.@global_rules[0].ad_url)" -google_status=$(curl -I -4 -m 3 -o /dev/null -s -w %{http_code} http://www.google.com/generate_204) -[ "$google_status" -ne "204" ] && proxy="https://ghproxy.com/" +proxy="" +# google_status=$(curl -I -4 -m 3 -o /dev/null -s -w %{http_code} http://www.google.com/generate_204) +# [ "$google_status" -ne "204" ] && proxy="https://ghproxy.com/" log(){ echo "$(date +'%Y-%m-%d %H:%M:%S') $*" >> $LOG } @@ -23,7 +24,7 @@ echo '------------Update start------------' >> $LOG [ ! -d $TMP2 ] && mkdir -p $TMP2 2>/dev/null echo -e "\e[1;32mDownloading "$proxy${chnroute_url}"\e[0m" - curl --connect-timeout 5 -m 60 --ipv4 -kfSLo "/tmp/china.txt" ""$proxy"${chnroute_url}" + curl --connect-timeout 5 -m 60 --ipv4 -kfSLo "/tmp/china.txt" "$proxy${chnroute_url}" [[ -f /tmp/china.txt && $? == 0 ]] && { if ! cmp -s /tmp/china.txt $TMP/china.txt;then cp -f /tmp/china.txt $TMP/china.txt @@ -37,7 +38,7 @@ echo '------------Update start------------' >> $LOG } echo -e "\e[1;32mDownloading "$proxy${chnroute6_url}"\e[0m" - curl --connect-timeout 5 -m 60 --ipv4 -kfSLo "/tmp/china_v6.txt" ""$proxy"${chnroute6_url}" + curl --connect-timeout 5 -m 60 --ipv4 -kfSLo "/tmp/china_v6.txt" "$proxy${chnroute6_url}" [[ -f /tmp/china_v6.txt && $? == 0 ]] && { if ! cmp -s /tmp/china_v6.txt $TMP/china_v6.txt;then cp -f /tmp/china_v6.txt $TMP/china_v6.txt @@ -45,12 +46,12 @@ echo '------------Update start------------' >> $LOG log "By Update : Updated China IPv6 List Total Number of Items :` cat /etc/bypass/china_v6.txt | wc -l` " [ $A = N ] && ipset list china_v6 >/dev/null 2>&1 && $DIR/chinaipset v6 else - log "By Update : China IPv6 List Total Number of Items :`cat /etc/bypass/china_v6.txt | wc -l)` " + log "By Update : China IPv6 List Total Number of Items :`cat /etc/bypass/china_v6.txt | wc -l` " fi } echo -e "\e[1;32mDownloading "$proxy${gfwlist_url}"\e[0m" - curl --connect-timeout 5 -m 60 --ipv4 -kfSLo "/tmp/gfw.b64" ""$proxy"${gfwlist_url}" + curl --connect-timeout 5 -m 60 --ipv4 -kfSLo "/tmp/gfw.b64" "$proxy${gfwlist_url}" [[ -f /tmp/gfw.b64 && $? == 0 ]] && { $DIR/by-gfw >/dev/null 2>&1 if ! cmp -s /tmp/gfwnew.txt $TMP/gfw.list ;then @@ -63,7 +64,7 @@ echo '------------Update start------------' >> $LOG } echo -e "\e[1;32mDownloading "$proxy${domains_url}"\e[0m" - curl --connect-timeout 5 -m 60 --ipv4 -kfSLo "/tmp/domains_cn.txt" ""$proxy"${domains_url}" + curl --connect-timeout 5 -m 60 --ipv4 -kfSLo "/tmp/domains_cn.txt" "$proxy${domains_url}" [[ -f /tmp/domains_cn.txt && $? == 0 ]] && { if ! cmp -s /tmp/domains_cn.txt $TMP/domains_cn.txt;then @@ -71,7 +72,7 @@ echo '------------Update start------------' >> $LOG mv /tmp/domains_cn.txt $TMP2/domains_cn.txt log "By Update : Updated China Domains List Total Number of Items :` cat /etc/bypass/domains_cn.txt | wc -l` " else - log "By Update : China Domains Total Number of Items :`cat /etc/bypass/domains_cn.txt | wc -l)` " + log "By Update : China Domains Total Number of Items :`cat /etc/bypass/domains_cn.txt | wc -l` " fi } @@ -84,7 +85,7 @@ echo '------------Update start------------' >> $LOG mv /tmp/ad_list.txt $TMP2/ad_list.txt log "By Update : anti-AD Update List Total Number of Items :` cat /etc/bypass/ad_list.txt | wc -l` " else - log "By Update : anti-AD List Total Number of Items :`cat /etc/bypass/ad_list.txt | wc -l)` " + log "By Update : anti-AD List Total Number of Items :`cat /etc/bypass/ad_list.txt | wc -l` " fi } log "By Update : Check or update IPV4/IPV6/GFW/AD list complete! "