diff --git a/README.md b/README.md index ed994c2..2b4368c 100644 --- a/README.md +++ b/README.md @@ -57,8 +57,8 @@ export url='https://fastly.jsdelivr.net/gh/juewuy/ShellClash@master' && wget -q ~**Use a low version of wget (prompt not to support https) local installation**:
```Shell -#by shellclash.ga -export url='http://shellclash.ga/' && wget -q -O /tmp/install.sh $url/install.sh && sh /tmp/install.sh && source /etc/profile &> /dev/null +#by shellclash.cf +export url='http://shellclash.cf/' && wget -q -O /tmp/install.sh $url/install.sh && sh /tmp/install.sh && source /etc/profile &> /dev/null ``` ~**After installation by non-root users**, please execute the following additional commands to read environment variables:
diff --git a/README_CN.md b/README_CN.md index cf6f6de..6f2b2b6 100644 --- a/README_CN.md +++ b/README_CN.md @@ -56,7 +56,7 @@ export url='https://raw.githubusercontent.com/juewuy/ShellClash/master' && sh -c #jsDelivrCDN源 export url='https://fastly.jsdelivr.net/gh/juewuy/ShellClash@master' && sh -c "$(curl -kfsSl $url/install.sh)" && source /etc/profile &> /dev/null #作者私人源 -export url='https://shellclash.ga' && sh -c "$(curl -kfsSl $url/install.sh)" && source /etc/profile &> /dev/null +export url='https://shellclash.cf' && sh -c "$(curl -kfsSl $url/install.sh)" && source /etc/profile &> /dev/null ``` ~**使用wget安装**:
@@ -67,14 +67,14 @@ export url='https://raw.githubusercontent.com/juewuy/ShellClash/master' && wget #jsDelivrCDN源 export url='https://fastly.jsdelivr.net/gh/juewuy/ShellClash@master' && wget -q --no-check-certificate -O /tmp/install.sh $url/install.sh && sh /tmp/install.sh && source /etc/profile &> /dev/null #作者私人源 -export url='http://shellclash.ga/' && wget -q -O /tmp/install.sh $url/install.sh && sh /tmp/install.sh && source /etc/profile &> /dev/null +export url='http://shellclash.cf/' && wget -q -O /tmp/install.sh $url/install.sh && sh /tmp/install.sh && source /etc/profile &> /dev/null ``` ~**使用低版本wget(提示不支持https)安装**:
```Shell #作者私人http源 -export url='http://shellclash.ga/' && wget -q -O /tmp/install.sh $url/install.sh && sh /tmp/install.sh && source /etc/profile &> /dev/null +export url='http://shellclash.cf/' && wget -q -O /tmp/install.sh $url/install.sh && sh /tmp/install.sh && source /etc/profile &> /dev/null ``` ~**非root用户安装后**请额外执行以下命令以读取环境变量:
diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index ad74c7d..854c982 100644 Binary files a/bin/clashfm.tar.gz and b/bin/clashfm.tar.gz differ diff --git a/bin/version b/bin/version index 6434421..987e25d 100644 --- a/bin/version +++ b/bin/version @@ -3,4 +3,4 @@ clashpre_v=2021.09.15 clash_v=v1.7.1 GeoIP_v=20220531 meta_v=1.11.1 -versionsh=1.6.1 +versionsh=1.6.2 diff --git a/scripts/getdate.sh b/scripts/getdate.sh index 89e4a53..0fa63f7 100644 --- a/scripts/getdate.sh +++ b/scripts/getdate.sh @@ -37,7 +37,7 @@ linkserver(){ echo -e "\033[32m感谢以下作者的无私奉献!!!\033[0m" echo 当前使用后端为:$server_link echo 1 api.dler.io (墙洞提供) - echo 2 sub.shellclash.ga (作者提供) + echo 2 sub.shellclash.cf (作者提供) echo 3 sub.xeton.dev (SUB作者T大提供) echo 4 sub.id9.cc (品云提供) echo 5 sub.maoxiongnet.com (猫熊提供) @@ -452,12 +452,19 @@ getcore(){ $clashdir/start.sh webget /tmp/clash.new $corelink if [ "$?" = "1" ];then echo -e "\033[31m核心文件下载失败!\033[0m" + rm -rf /tmp/clash.new else - echo -e "\033[32m$clashcore核心下载成功!\033[0m" - mv -f /tmp/clash.new $bindir/clash - chmod 777 $bindir/clash #授予权限 - setconfig clashcore $clashcore - setconfig clashv $version + chmod -x /tmp/clash.new && /tmp/clash.new -v >/dev/null 2>&1 + if [ "$?" != 0 ];then + echo -e "\033[31m核心文件下载失败!\033[0m" + rm -rf /tmp/clash.new + else + echo -e "\033[32m$clashcore核心下载成功!\033[0m" + mv -f /tmp/clash.new $bindir/clash + chmod -x $bindir/clash + setconfig clashcore $clashcore + setconfig clashv $version + fi fi } setcore(){ @@ -776,7 +783,7 @@ setserver(){ release_url='' saveserver elif [ "$num" = 4 ]; then - update_url='https://gh.shellclash.ga/master' + update_url='https://gh.shellclash.cf/master' release_url='' saveserver elif [ "$num" = 5 ]; then @@ -788,7 +795,7 @@ setserver(){ release_url='' saveserver elif [ "$num" = 7 ]; then - update_url='http://test.shellclash.ga' + update_url='http://test.shellclash.cf' release_url='' saveserver elif [ "$num" = 8 ]; then diff --git a/scripts/start.sh b/scripts/start.sh index ab61074..d0f76eb 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -137,7 +137,7 @@ getyaml(){ #前后端订阅服务器地址索引,可在此处添加! Server=`sed -n ""$server_link"p"</dev/null 2>&1 - [ "$?" != 0 ] && rm -rf $bindir/clash if [ ! -f $bindir/clash ];then if [ -f $clashdir/clash ];then mv $clashdir/clash $bindir/clash && chmod +x $bindir/clash