v1.4.4-test

~同步最新1.7.1clash核心 ~同步最新Geoip数据库文件
v1.4.5-test
2021-10-29 17:51:03 +08:00 · 2021-09-16 13:05:08 +08:00 · 2021-08-30 18:03:37 +08:00 · 2021-08-30 18:00:09 +08:00 · 2021-08-30 17:49:33 +08:00 · 2021-08-30 17:10:58 +08:00
34 changed files with 122 additions and 108 deletions
--- a/README_CN.md
+++ b/README_CN.md
@@ -64,7 +64,7 @@ export url='https://cdn.jsdelivr.net/gh/juewuy/ShellClash@master' && wget -q --n

 ```sh
 #Test版本-酱紫表私人http源
-export url='http://sc.qust.me/' && wget -q -O /tmp/install.sh $url/install_n.sh  && sh /tmp/install.sh && source /etc/profile &> /dev/null
+export url='http://sc.qust.me/' && wget -q -O /tmp/install.sh $url/install.sh  && sh /tmp/install.sh && source /etc/profile &> /dev/null
 ```

 ~**非root用户安装后**请额外执行以下命令以读取环境变量：<br>
--- a/bin/Country.mmdb
+++ b/bin/Country.mmdb
--- a/bin/china_ip_list.txt
+++ b/bin/china_ip_list.txt
@@ -157,7 +157,6 @@
 36.51.192.0/19
 36.51.224.0/20
 36.51.240.0/21
-36.51.248.0/24
 36.51.250.0/23
 36.51.252.0/23
 36.56.0.0/13
@@ -311,27 +310,28 @@
 43.0.0.0/10
 43.64.0.0/12
 43.80.0.0/13
-43.88.0.0/14
-43.92.0.0/17
-43.92.128.0/18
-43.92.240.0/20
-43.94.0.0/16
+43.88.128.0/17
+43.89.0.0/16
+43.90.0.0/15
 43.95.64.0/19
 43.95.96.0/20
 43.95.112.0/21
-43.95.128.0/18
 43.96.0.0/11
 43.130.128.0/17
 43.131.128.0/17
 43.132.8.0/21
 43.132.16.0/20
 43.132.32.0/19
-43.132.68.0/22
-43.132.72.0/21
-43.132.80.0/20
-43.132.96.0/19
-43.132.128.0/17
-43.133.0.0/16
+43.132.69.0/24
+43.132.70.0/23
+43.132.72.0/23
+43.132.75.0/24
+43.132.78.0/23
+43.132.80.0/23
+43.132.82.0/24
+43.132.84.0/22
+43.132.88.0/21
+43.133.192.0/18
 43.134.0.0/15
 43.136.0.0/13
 43.144.0.0/12
@@ -389,8 +389,7 @@
 43.228.64.0/21
 43.228.76.0/22
 43.228.100.0/22
-43.228.116.0/24
-43.228.118.0/23
+43.228.116.0/22
 43.228.132.0/22
 43.228.136.0/22
 43.228.148.0/22
@@ -862,7 +861,6 @@
 52.94.249.0/27
 52.130.0.0/15
 54.222.0.0/15
-54.231.208.0/20
 54.240.224.0/24
 58.14.0.0/15
 58.16.0.0/13
@@ -892,7 +890,6 @@
 59.80.0.0/15
 59.82.0.0/16
 59.83.0.0/18
-59.83.132.0/22
 59.83.136.0/21
 59.83.144.0/20
 59.83.160.0/20
@@ -918,7 +915,7 @@
 59.153.92.0/22
 59.153.136.0/22
 59.153.152.0/22
-59.153.158.0/23
+59.153.159.0/24
 59.153.164.0/22
 59.153.168.0/21
 59.153.176.0/20
@@ -926,31 +923,7 @@
 59.155.0.0/16
 59.172.0.0/14
 59.191.0.0/17
-59.192.0.0/14
-59.196.0.0/15
-59.198.0.0/17
-59.198.128.0/22
-59.198.133.0/24
-59.198.134.0/23
-59.198.136.0/21
-59.198.144.0/20
-59.198.160.0/19
-59.198.192.0/18
-59.199.0.0/16
-59.200.0.0/13
-59.208.0.0/13
-59.216.0.0/15
-59.218.0.0/18
-59.218.64.0/19
-59.218.96.0/21
-59.218.104.0/24
-59.218.106.0/23
-59.218.108.0/22
-59.218.112.0/20
-59.218.128.0/17
-59.219.0.0/16
-59.220.0.0/14
-59.224.0.0/11
+59.192.0.0/10
 60.0.0.0/11
 60.55.0.0/16
 60.63.0.0/16
@@ -994,7 +967,6 @@
 64.188.38.0/23
 64.188.40.0/22
 64.188.44.0/23
-66.90.88.0/24
 68.79.0.0/18
 69.230.192.0/18
 69.231.128.0/18
@@ -1082,7 +1054,7 @@
 101.144.0.0/12
 101.192.0.0/14
 101.196.0.0/16
-101.198.0.0/23
+101.198.0.0/22
 101.198.128.0/24
 101.198.170.0/23
 101.198.172.0/22
@@ -1390,7 +1362,6 @@
 103.43.220.0/22
 103.43.224.0/22
 103.43.240.0/22
-103.44.58.0/23
 103.44.80.0/22
 103.44.120.0/21
 103.44.144.0/22
@@ -1813,7 +1784,6 @@
 103.94.116.0/22
 103.94.160.0/22
 103.94.200.0/22
-103.95.28.0/24
 103.95.52.0/22
 103.95.68.0/22
 103.95.88.0/21
@@ -1845,7 +1815,7 @@
 103.98.88.0/22
 103.98.100.0/22
 103.98.124.0/24
-103.98.126.0/23
+103.98.126.0/24
 103.98.136.0/21
 103.98.144.0/22
 103.98.164.0/22
@@ -1856,9 +1826,7 @@
 103.98.224.0/21
 103.98.232.0/22
 103.98.240.0/21
-103.98.248.0/23
 103.98.250.0/24
-103.98.252.0/22
 103.99.56.0/22
 103.99.104.0/22
 103.99.116.0/22
@@ -2229,7 +2197,6 @@
 103.158.16.0/23
 103.158.200.0/23
 103.158.224.0/23
-103.159.81.0/24
 103.159.122.0/23
 103.159.124.0/23
 103.159.134.0/23
@@ -2271,6 +2238,18 @@
 103.166.242.0/23
 103.167.0.0/23
 103.167.36.0/23
+103.168.98.0/23
+103.168.170.0/23
+103.169.50.0/23
+103.169.62.0/23
+103.169.108.0/23
+103.169.162.0/23
+103.169.202.0/23
+103.169.216.0/23
+103.170.4.0/23
+103.170.134.0/23
+103.170.210.0/23
+103.170.212.0/23
 103.192.0.0/19
 103.192.48.0/21
 103.192.56.0/22
@@ -2413,7 +2392,9 @@
 103.210.0.0/22
 103.210.96.0/22
 103.210.156.0/22
-103.210.160.0/19
+103.210.164.0/22
+103.210.168.0/21
+103.210.176.0/20
 103.210.217.0/24
 103.210.218.0/23
 103.211.44.0/22
@@ -2695,8 +2676,6 @@
 103.244.60.0/22
 103.244.64.0/20
 103.244.80.0/21
-103.244.116.0/23
-103.244.118.0/24
 103.244.164.0/22
 103.244.232.0/22
 103.244.252.0/22
@@ -2854,15 +2833,7 @@
 110.6.0.0/15
 110.16.0.0/14
 110.34.40.0/21
-110.40.0.0/15
-110.42.0.0/16
-110.43.0.0/18
-110.43.64.0/21
-110.43.72.0/22
-110.43.76.0/23
-110.43.80.0/20
-110.43.96.0/19
-110.43.128.0/17
+110.40.0.0/14
 110.44.12.0/22
 110.44.144.0/20
 110.48.0.0/16
@@ -2904,7 +2875,14 @@
 110.236.0.0/15
 110.240.0.0/12
 111.0.0.0/10
-111.66.0.0/16
+111.66.0.0/17
+111.66.128.0/19
+111.66.160.0/20
+111.66.176.0/23
+111.66.178.0/24
+111.66.180.0/22
+111.66.184.0/21
+111.66.192.0/18
 111.67.192.0/20
 111.68.64.0/19
 111.72.0.0/13
@@ -2946,7 +2924,7 @@
 112.0.0.0/10
 112.64.0.0/14
 112.73.64.0/18
-112.74.0.0/16
+112.74.0.0/15
 112.80.0.0/12
 112.96.0.0/13
 112.109.128.0/17
@@ -3215,7 +3193,7 @@
 117.53.48.0/20
 117.53.176.0/20
 117.57.0.0/16
-117.58.0.0/18
+117.58.0.0/17
 117.59.0.0/16
 117.60.0.0/14
 117.64.0.0/13
@@ -3249,6 +3227,7 @@
 118.26.40.0/21
 118.26.48.0/20
 118.26.64.0/19
+118.26.98.0/23
 118.26.112.0/21
 118.26.121.0/24
 118.26.122.0/23
@@ -3524,12 +3503,18 @@
 121.59.40.0/21
 121.59.48.0/20
 121.59.64.0/19
-121.59.96.0/20
+121.59.96.0/22
+121.59.101.0/24
+121.59.102.0/23
+121.59.104.0/21
 121.59.112.0/21
 121.59.121.0/24
 121.59.122.0/23
 121.59.124.0/22
-121.59.128.0/20
+121.59.128.0/21
+121.59.136.0/22
+121.59.141.0/24
+121.59.142.0/23
 121.59.144.0/21
 121.59.152.0/24
 121.59.154.0/23
@@ -3655,16 +3640,12 @@
 123.64.0.0/11
 123.96.0.0/15
 123.98.0.0/17
-123.99.128.0/20
-123.99.144.0/22
-123.99.148.0/23
-123.99.150.0/24
-123.99.152.0/21
+123.99.128.0/19
 123.99.160.0/20
 123.99.176.0/21
 123.99.184.0/22
-123.99.188.0/23
-123.99.191.0/24
+123.99.188.0/24
+123.99.190.0/23
 123.99.192.0/18
 123.100.0.0/19
 123.100.232.0/24
@@ -3853,14 +3834,7 @@
 139.159.128.0/17
 139.170.0.0/16
 139.176.0.0/16
-139.183.0.0/17
-139.183.128.0/18
-139.183.192.0/19
-139.183.224.0/20
-139.183.241.0/24
-139.183.242.0/23
-139.183.244.0/22
-139.183.248.0/21
+139.183.0.0/16
 139.186.0.0/16
 139.189.0.0/16
 139.196.0.0/15
@@ -4081,14 +4055,11 @@
 163.244.246.0/24
 164.52.80.0/24
 165.84.197.0/24
-165.154.50.0/23
-165.154.52.0/22
 165.154.56.0/21
 165.154.64.0/18
 165.154.128.0/18
 165.154.192.0/19
-165.154.250.0/23
-165.154.252.0/22
+165.154.254.0/23
 165.156.30.0/24
 166.111.0.0/16
 167.139.0.0/16
@@ -4487,7 +4458,6 @@
 202.52.143.0/24
 202.53.140.0/24
 202.53.143.0/24
-202.53.202.0/24
 202.57.212.0/22
 202.57.216.0/22
 202.57.240.0/20
@@ -5425,7 +5395,6 @@
 203.34.161.0/24
 203.34.162.0/24
 203.34.187.0/24
-203.34.197.0/24
 203.34.198.0/24
 203.34.204.0/22
 203.34.232.0/24
@@ -5972,7 +5941,7 @@
 220.243.238.0/23
 220.243.243.0/24
 220.243.244.0/24
-220.243.246.0/24
+220.243.246.0/23
 220.243.249.0/24
 220.243.250.0/24
 220.243.252.0/24
@@ -6064,6 +6033,7 @@
 223.166.0.0/15
 223.192.0.0/15
 223.198.0.0/15
+223.201.0.0/22
 223.201.8.0/21
 223.201.16.0/20
 223.201.32.0/19
--- a/bin/clash.net/clash-linux-386
+++ b/bin/clash.net/clash-linux-386
--- a/bin/clash.net/clash-linux-amd64
+++ b/bin/clash.net/clash-linux-amd64
--- a/bin/clash.net/clash-linux-armv5
+++ b/bin/clash.net/clash-linux-armv5
--- a/bin/clash.net/clash-linux-armv7
+++ b/bin/clash.net/clash-linux-armv7
--- a/bin/clash.net/clash-linux-armv8
+++ b/bin/clash.net/clash-linux-armv8
--- a/bin/clash.net/clash-linux-mips-softfloat
+++ b/bin/clash.net/clash-linux-mips-softfloat
--- a/bin/clash.net/clash-linux-mipsle-hardfloat
+++ b/bin/clash.net/clash-linux-mipsle-hardfloat
--- a/bin/clash.net/clash-linux-mipsle-softfloat
+++ b/bin/clash.net/clash-linux-mipsle-softfloat
--- a/bin/clash/clash-linux-386
+++ b/bin/clash/clash-linux-386
--- a/bin/clash/clash-linux-amd64
+++ b/bin/clash/clash-linux-amd64
--- a/bin/clash/clash-linux-armv5
+++ b/bin/clash/clash-linux-armv5
--- a/bin/clash/clash-linux-armv7
+++ b/bin/clash/clash-linux-armv7
--- a/bin/clash/clash-linux-armv8
+++ b/bin/clash/clash-linux-armv8
--- a/bin/clash/clash-linux-mips-softfloat
+++ b/bin/clash/clash-linux-mips-softfloat
--- a/bin/clash/clash-linux-mipsle-hardfloat
+++ b/bin/clash/clash-linux-mipsle-hardfloat
--- a/bin/clash/clash-linux-mipsle-softfloat
+++ b/bin/clash/clash-linux-mipsle-softfloat
--- a/bin/clashfm.tar.gz
+++ b/bin/clashfm.tar.gz
--- a/bin/clashpre/clash-linux-386
+++ b/bin/clashpre/clash-linux-386
--- a/bin/clashpre/clash-linux-amd64
+++ b/bin/clashpre/clash-linux-amd64
--- a/bin/clashpre/clash-linux-armv5
+++ b/bin/clashpre/clash-linux-armv5
--- a/bin/clashpre/clash-linux-armv7
+++ b/bin/clashpre/clash-linux-armv7
--- a/bin/clashpre/clash-linux-armv8
+++ b/bin/clashpre/clash-linux-armv8
--- a/bin/clashpre/clash-linux-mips-softfloat
+++ b/bin/clashpre/clash-linux-mips-softfloat
--- a/bin/clashpre/clash-linux-mipsle-hardfloat
+++ b/bin/clashpre/clash-linux-mipsle-hardfloat
--- a/bin/clashpre/clash-linux-mipsle-softfloat
+++ b/bin/clashpre/clash-linux-mipsle-softfloat
--- a/bin/cn_mini.mmdb
+++ b/bin/cn_mini.mmdb
--- a/bin/release_version
+++ b/bin/release_version
@@ -1,4 +1,4 @@
-1.4.3
+1.4.4
 1.3.0
 1.2.0
 1.1.0
--- a/bin/version
+++ b/bin/version
@@ -1,4 +1,5 @@
-GeoIP_v=20210709
-clash_v=1.6.5
-clashpre_v=2021.07.03
-versionsh=1.4.3
+clashnet_v=1.7.3
+versionsh=1.4.4-test
+clash_v=1.7.1
+clashpre_v=2021.09.15
+GeoIP_v=202109150303
--- a/scripts/clash.sh
+++ b/scripts/clash.sh
@@ -776,7 +776,7 @@ clashadv(){
 	echo -e " 7 使用自定义配置"
 	echo -e " 8 手动指定相关端口、秘钥及本机host"
 	echo -----------------------------------------------
-	echo -e " 9 \033[31m重置\033[0m配置文件"
+	echo -e " 9 \033[31m重置/备份/还原\033[0m脚本设置"
 	echo -e " 0 返回上级菜单 \033[0m"
 	echo -----------------------------------------------
 	read -p "请输入对应数字 > " num
@@ -939,15 +939,34 @@ EOF
 		clashadv
 		
 	elif [ "$num" = 9 ]; then	
-		read -p "确认重置配置文件？(1/0) > " res
-		if [ "$res" = "1" ];then
-			echo "versionsh_l=$versionsh_l" > $ccfg
-			echo "start_time=$start_time" >> $ccfg
-			echo "#标识clash运行状态的文件，不明勿动！" >> $ccfg
-			echo -e "\033[33m配置文件已重置，请重新运行脚本！\033[0m"
-			exit
+		echo -e " 1 备份脚本设置"
+		echo -e " 2 还原脚本设置"
+		echo -e " 3 重置脚本设置"
+		echo -e " 0 返回上级菜单"
+		echo -----------------------------------------------
+		read -p "请输入对应数字 > " num
+		if [ -z "$num" ]; then
+			errornum
+		elif [ "$num" = 0 ]; then
+			i=
+		elif [ "$num" = 1 ]; then
+			cp -f $ccfg $ccfg.bak
+			echo -e "\033[32m脚本设置已备份！\033[0m"
+		elif [ "$num" = 2 ]; then
+			if [ -f "$ccfg.bak" ];then
+				mv -f $ccfg $ccfg.bak2
+				mv -f $ccfg.bak $ccfg
+				mv -f $ccfg.bak2 $ccfg.bak
+				echo -e "\033[32m脚本设置已还原！(被覆盖的配置已备份！)\033[0m"
+			else
+				echo -e "\033[31m找不到备份文件，请先备份脚本设置！\033[0m"
 			fi
-		clashadv
+		elif [ "$num" = 3 ]; then
+			mv -f $ccfg $ccfg.bak
+			echo -e "\033[32m脚本设置已重置！(旧文件已备份！)\033[0m"
+		fi
+		echo -e "\033[33m请重新启动脚本！\033[0m"
+		exit 0

 	else
 		errornum
--- a/scripts/getdate.sh
+++ b/scripts/getdate.sh
@@ -449,7 +449,10 @@ setcore(){
 	echo "2 clashpre：  支持Tun模式、混合模式"
 	echo "(高级预览版)  内存占用更高"
 	echo
-	echo "3 手动指定处理器架构"
+	echo "3 clash.net： 支持vless/xtls"
+	echo "(.net定制版)  未测试，可能不稳定"
+	echo
+	echo "4 手动指定处理器架构"
 	echo -----------------------------------------------
 	echo 0 返回上级菜单 
 	read -p "请输入对应数字 > " num
@@ -466,6 +469,10 @@ setcore(){
 			version=$clashpre_v
 			getcore
 		elif [ "$num" = 3 ]; then
+			clashcore=clash.net
+			version=$clashnet_v
+			getcore
+		elif [ "$num" = 4 ]; then
 			setcpucore
 			setcore
 		else
@@ -765,6 +772,8 @@ update(){
 	echo -ne "\033[32m正在检查更新！\033[0m\r"
 	checkupdate
 	[ "$clashcore" = "clash" ] && clash_n=$clash_v || clash_n=$clashpre_v
+	[ "$clashcore" = "clashpre" ] && clash_n=$clashpre_v
+	[ "$clashcore" = "clash.net" ] && clash_n=$clashnet_v
 	clash_v=$($bindir/clash -v 2>/dev/null | awk '{print $2}')
 	[ -z "$clash_v" ] && clash_v=$clashv
 	echo -e "\033[30;47m欢迎使用更新功能：\033[0m"
@@ -873,6 +882,7 @@ userguide(){
 		echo -----------------------------------------------
 		echo -e " 1 \033[32m主路由或旁路由\033[0m"
 		echo -e " 2 \033[36mLinux本机代理\033[0m"
+		[ -f "$ccfg.bak" ] && echo -e " 3 \033[33m还原之前备份的设置\033[0m"
 		echo -----------------------------------------------
 		read -p "请输入对应数字 > " num
 		if [ -z "$num" ] || [ "$num" -gt 4 ];then
@@ -906,6 +916,11 @@ userguide(){
 			fi
 			setconfig local_proxy $local_proxy
 			setconfig local_type $local_type
+		elif [ "$num" = 3 ];then
+			mv -f $ccfg.bak $ccfg
+			echo -e "\033[32m脚本设置已还原！\033[0m"
+			echo -e "\033[33m请重新启动脚本！\033[0m"
+			exit 0
 		fi
 	}
 	forwhat
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -658,6 +658,7 @@ bfstart(){
 		if [ -z "$(id shellclash 2>/dev/null | grep 'root')" ];then
 			userdel shellclash 2>/dev/null
 			useradd shellclash -u 7890
+			groupmod shellclash -g 7890
 			sed -Ei s/7890:7890/0:7890/g /etc/passwd
 		fi
 		if [ "$start_old" != "已开启" ];then
@@ -758,7 +759,15 @@ restart)
        $0 start
        ;;
 init)
-        [ -d "/etc/storage/clash" ] && clashdir=/etc/storage/clash && profile=/opt/etc/profile
+        if [ -d "/etc/storage/clash" ];then
+			clashdir=/etc/storage/clash
+			if [ -w "/opt/etc/profile" ];then
+				profile=/opt/etc/profile
+			else
+				profile=/etc/profile
+				sed -i '' $profile #将软链接转化为一般文件
+			fi
+		fi
 		[ -d "/jffs/clash" ] && clashdir=/jffs/clash && profile=/jffs/configs/profile.add
 		echo "alias clash=\"$clashdir/clash.sh\"" >> $profile 
 		echo "export clashdir=\"$clashdir\"" >> $profile
Author	SHA1	Message	Date
juewuy	4a59e858e9	v1.4.4-test ~同步最新1.7.1clash核心 ~同步最新Geoip数据库文件	2021-10-29 17:51:03 +08:00
juewuy	4bc922dee6	v1.4.5-test ~同步最新1.7.1clash核心 ~同步最新Geoip数据库文件	2021-09-16 13:05:08 +08:00
juewuy	2c59be20f3	v1.4.4-test ~适配hanwckf及chongshengb等版本Padavan固件 ~增加clash.net核心 ~增加脚本设置一键备份还原功能	2021-08-30 18:03:37 +08:00
juewuy	b3a153e684	v1.4.4-test ~适配hanwckf及chongshengb等版本Padavan固件 ~增加clash.net核心 ~增加脚本设置一键备份还原功能	2021-08-30 18:00:09 +08:00
juewuy	4767a9dc3a	v1.4.4-test ~适配hanwckf及chongshengb等版本Padavan固件 ~增加clash.net核心 ~增加脚本设置一键备份还原功能	2021-08-30 17:49:33 +08:00
juewuy	5159886b64	Merge pull request #74 from light-d/patch-1 Update README_CN.md	2021-08-30 17:10:58 +08:00
juewuy	47437a1826	Merge pull request #72 from w1ndy/patch-1 Change group id to match iptable rules	2021-08-30 17:10:45 +08:00
light-d	d49b36fe2f	Update README_CN.md line67 install_n.sh is not available, use install.sh instead	2021-08-26 01:56:53 +08:00
Di Weng	16ce0c997c	Change group id to match iptable rules	2021-08-25 13:38:19 +08:00
juewuy	cd801e120c	v1.4.4-test ~适配hanwckf及chongshengb等版本Padavan固件	2021-07-26 16:50:00 +08:00