diff --git a/bin/ShellClash.tar.gz b/bin/ShellClash.tar.gz index 1a52649..fa8ef16 100644 Binary files a/bin/ShellClash.tar.gz and b/bin/ShellClash.tar.gz differ diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index 8fe0053..3893d94 100644 Binary files a/bin/clashfm.tar.gz and b/bin/clashfm.tar.gz differ diff --git a/bin/version b/bin/version index 4098ce0..8d5b9b4 100644 --- a/bin/version +++ b/bin/version @@ -2,5 +2,5 @@ clashnet_v=v1.7.6 clashpre_v=2022.11.25 clash_v=v1.7.1 meta_v=v1.14.2 -versionsh=1.7.3 GeoIP_v=20230318 +versionsh=1.7.3b diff --git a/install.sh b/install.sh index 26b8427..5a8a26f 100644 --- a/install.sh +++ b/install.sh @@ -55,15 +55,14 @@ gettar(){ echo ----------------------------------------------- echo 开始解压文件! mkdir -p $clashdir > /dev/null - tar -zxf '/tmp/ShellClash.tar.gz' -C $clashdir/ - [ $? -ne 0 ] && tar -zxf --no-same-owner '/tmp/ShellClash.tar.gz' -C $clashdir/ - if [ $? -ne 0 ];then + tar -zxf '/tmp/ShellClash.tar.gz' -C $clashdir/ || tar -zxf --no-same-owner '/tmp/ShellClash.tar.gz' -C $clashdir/ + if [ -f $clashdir/init.sh ];then + source $clashdir/init.sh >/dev/null + else rm -rf /tmp/ShellClash.tar.gz $echo "\033[33m文件解压失败!\033[0m" error_down exit 1 - else - source $clashdir/init.sh >/dev/null fi fi } diff --git a/scripts/init.sh b/scripts/init.sh index f8ac4f2..4fbc4b5 100644 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (C) Juewuy -version=1.7.3 +version=1.7.3b setdir(){ dir_avail(){ diff --git a/scripts/start.sh b/scripts/start.sh index 76a7f91..4ef1078 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -572,7 +572,7 @@ start_ipt_dns(){ fi iptables -t nat -I PREROUTING -p udp --dport 53 -j clash_dns #ipv6DNS - if [ -n "$(lsmod | grep 'ip6table_nat')" ];then + if [ -n "$(lsmod | grep 'ip6table_nat')" -a -n "$(lsmod | grep 'xt_nat')" ];then ip6tables -t nat -N clashv6_dns > /dev/null 2>&1 if [ "$macfilter_type" = "白名单" -a -n "$(cat $clashdir/mac)" ];then #mac白名单