passwall : fix maybe not subscribe problem

Author: Lienol

lienol/luci-app-passwall/Makefile

@@ -81,7 +81,7 @@ define Package/$(PKG_NAME)
   SUBMENU:=3. Applications
   TITLE:=LuCI support for PassWall By Lienol
   PKGARCH:=all
-  DEPENDS:=+curl +libcurl +libmbedtls +ca-bundle +ca-certificates +resolveip +iptables-mod-tproxy +kmod-ipt-tproxy +iptables-mod-ipopt +kmod-ipt-ipopt +ip +ipset +coreutils +coreutils-base64 +coreutils-nohup +luci-lib-jsonc +unzip \
+  DEPENDS:=+curl +wget +libcurl +libmbedtls +ca-bundle +ca-certificates +resolveip +iptables-mod-tproxy +kmod-ipt-tproxy +iptables-mod-ipopt +kmod-ipt-ipopt +ip +ipset +coreutils +coreutils-base64 +coreutils-nohup +luci-lib-jsonc +unzip \
   +dnsmasq-full +tcping \
   +PACKAGE_$(PKG_NAME)_INCLUDE_redsocks2:redsocks2 \
   +PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks:shadowsocks-libev-ss-redir \

lienol/luci-app-passwall/root/usr/share/passwall/rule_update.sh

@@ -33,16 +33,16 @@ uci_get_by_type() {
 
 # rule update
 echo $Date: 开始更新规则，请等待... >$LOG_FILE
-#wget -q --no-check-certificate --timeout=15 https://raw.githubusercontent.com/monokoo/koolshare.github.io/acelan_softcenter_ui/maintain_files/version1 -O /tmp/version1
-status1=$(curl -w %{http_code} --connect-timeout 10 $url_main/version1 --silent -o /tmp/version1)
-if [ -z "$status1" ] || [ "$status1" == "404" ]; then
+#/usr/bin/wget -q --no-check-certificate --timeout=15 https://raw.githubusercontent.com/monokoo/koolshare.github.io/acelan_softcenter_ui/maintain_files/version1 -O /tmp/version1
+status1=$(/usr/bin/curl -w %{http_code} --connect-timeout 10 $url_main/version1 --silent -o /tmp/version1)
+if [ "$?" != 0 ] || [ ! -f "/tmp/version1" ] || [ -z "$status1" ] || [ "$status1" != "200" ]; then
 	echo $Date: 无法访问更新接口，请更新接口！ >>$LOG_FILE
 	exit
 fi
 online_content=$(cat /tmp/version1 2>/dev/null)
 if [ -z "$online_content" ]; then
 	rm -rf /tmp/version1
-	echo $Date: 没有检测到在线版本，可能是访问github有问题，去大陆白名单模式试试吧！ >>$LOG_FILE
+	echo $Date: 没有检测到在线版本，可能是访问github有问题！ >>$LOG_FILE
 	exit
 fi
 
@@ -57,9 +57,9 @@ if [ "$gfwlist_update" == 1 ]; then
 		if [ "$version_gfwlist1" != "$version_gfwlist2" -o "$md5sum_gfwlist2" != "$local_md5sum_gfwlist" ]; then
 			echo $Date: 检测到新版本gfwlist，开始更新... >>$LOG_FILE
 			echo $Date: 下载gfwlist到临时文件... >>$LOG_FILE
-			#wget --no-check-certificate --timeout=15 -q https://raw.githubusercontent.com/monokoo/koolshare.github.io/acelan_softcenter_ui/maintain_files/gfwlist.conf -O /tmp/gfwlist.conf
-			status2=$(curl -w %{http_code} --connect-timeout 10 $url_main/gfwlist.conf --silent -o /tmp/gfwlist.conf)
-			if [ -z "$status2" ] || [ "$status2" == "404" ]; then
+			#/usr/bin/wget --no-check-certificate --timeout=15 -q https://raw.githubusercontent.com/monokoo/koolshare.github.io/acelan_softcenter_ui/maintain_files/gfwlist.conf -O /tmp/gfwlist.conf
+			status2=$(/usr/bin/curl -w %{http_code} --connect-timeout 10 $url_main/gfwlist.conf --silent -o /tmp/gfwlist.conf)
+			if [ "$?" != 0 ] || [ ! -f "/tmp/gfwlist.conf" ] || [ -z "$status2" ] || [ "$status2" != "200" ]; then
 				echo $Date: 无法访问更新接口，请更新接口！ >>$LOG_FILE
 				exit
 			fi
@@ -94,9 +94,9 @@ if [ "$chnroute_update" == 1 ]; then
 		if [ "$version_chnroute1" != "$version_chnroute2" -o "$md5sum_chnroute2" != "$local_md5sum_chnroute" ]; then
 			echo $Date: 检测到新版本chnroute，开始更新... >>$LOG_FILE
 			echo $Date: 下载chnroute到临时文件... >>$LOG_FILE
-			#wget --no-check-certificate --timeout=15 -q https://raw.githubusercontent.com/monokoo/koolshare.github.io/acelan_softcenter_ui/maintain_files/chnroute.txt -O /tmp/chnroute
-			status3=$(curl -w %{http_code} --connect-timeout 10 $url_main/chnroute.txt --silent -o /tmp/chnroute)
-			if [ -z "$status3" ] || [ "$status3" == "404" ]; then
+			#/usr/bin/wget --no-check-certificate --timeout=15 -q https://raw.githubusercontent.com/monokoo/koolshare.github.io/acelan_softcenter_ui/maintain_files/chnroute.txt -O /tmp/chnroute
+			status3=$(/usr/bin/curl -w %{http_code} --connect-timeout 10 $url_main/chnroute.txt --silent -o /tmp/chnroute)
+			if [ "$?" != 0 ] || [ ! -f "/tmp/chnroute" ] || [ -z "$status3" ] || [ "$status3" == "404" ]; then
 				echo $Date: 无法访问更新接口，请更新接口！ >>$LOG_FILE
 				exit
 			fi

lienol/luci-app-passwall/root/usr/share/passwall/subscription.sh

@@ -326,16 +326,18 @@ start() {
 	for url in $subscribe_url
 	do
 		let index+=1
-		#/usr/bin/wget --no-check-certificate --timeout=8 -t 2 $url -P /var/${CONFIG}_sub
-		status=$(curl -w %{http_code} --connect-timeout 10 $url --silent -o /var/${CONFIG}_sub/$index)
-		[ -z "$status" ] || [ "$status" != "200" ] && echo "$Date: 订阅链接$url下载失败，请重试！" >> $LOG_FILE && continue
+		echo "$Date: 正在订阅：$url" >> $LOG_FILE
+		#status=$(/usr/bin/curl -w %{http_code} --connect-timeout 10 $url --silent -o /var/${CONFIG}_sub/$index)
+		result=$(/usr/bin/wget --no-check-certificate --timeout=8 -t 1 -O- $url)
+		[ "$?" != 0 ] || [ -z "$result" ] && echo "$Date: 订阅失败：$url，请检测订阅链接是否正常或使用代理尝试！" >> $LOG_FILE && continue
+		echo "$result" > /var/${CONFIG}_sub/$index
 	done
 	[ ! -d "/var/${CONFIG}_sub" ] || [ "$(ls /var/${CONFIG}_sub | wc -l)" -eq 0 ] && echo "$Date: 订阅失败" >> $LOG_FILE && rm -f "$LOCK_FILE" && exit 0
 	mkdir -p /usr/share/${CONFIG}/sub && rm -f /usr/share/${CONFIG}/sub/*
 	get_local_nodes
 	for file in /var/${CONFIG}_sub/*
 	do
-		[ -z "$(du -sh $file 2> /dev/null)" ] && echo "$Date: 订阅链接下载 $file 失败，请重试！" >> $LOG_FILE && continue
+		[ -z "$(du -sh $file 2> /dev/null)" ] && echo "$Date: 订阅失败：$url，解密失败！" >> $LOG_FILE && continue
 		decode_link=$(cat "$file" | /usr/bin/base64 -d 2> /dev/null)
 		maxnum=$(echo -n "$decode_link" | grep "MAX=" | awk -F"=" '{print $2}')
 		if [ -n "$maxnum" ]; then

lienol/luci-app-passwall/root/usr/share/passwall/test.sh

@@ -8,7 +8,7 @@ get_date() {
 }
 
 test_url() {
-	status=$(curl -I -o /dev/null -s --connect-timeout 5 -w %{http_code} "$1" | grep 200)
+	status=$(/usr/bin/curl -I -o /dev/null -s --connect-timeout 5 -w %{http_code} "$1" | grep 200)
 	echo $status
 }