From 8827f2d56159042caaa72fbc539cb385dea6af2b Mon Sep 17 00:00:00 2001 From: juewuy Date: Wed, 7 Oct 2020 11:21:05 +0800 Subject: [PATCH] =?UTF-8?q?v1.0.0beta13fix1=20~=E4=BF=AE=E5=A4=8D=E4=BA=86?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=9C=AA=E7=BB=8F=E8=BD=AC=E6=8D=A2=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E6=97=B6=E6=8A=A5=E9=94=99=E7=9A=84?= =?UTF-8?q?bug=20~=E5=B1=8F=E8=94=BD=E4=BA=86=E9=83=A8=E5=88=86=E5=B7=B2?= =?UTF-8?q?=E7=BB=8F=E6=97=A0=E6=B3=95=E4=BD=BF=E7=94=A8=E7=9A=84sub?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/clashfm.tar.gz | Bin 17771 -> 17775 bytes bin/version | 2 +- scripts/clash.sh | 2 +- scripts/getdate.sh | 56 ++++++++++++++++++++++----------------------- scripts/start.sh | 15 ++++++------ 5 files changed, 36 insertions(+), 39 deletions(-) diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index 4bf25173573c89133d1f132a281c9623be7909bc..1d4a4d19f1e4d5443c820ff753a04d6191658b8c 100644 GIT binary patch literal 17775 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 GJOKcG1nbTK literal 17771 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 z /dev/null 2>&1; then clashcfg elif [ $num -le $(cat /tmp/dhcp.leases | awk 'END{print NR}') ]; then macadd=$(cat /tmp/dhcp.leases | awk '{print $2}' | sed -n "$num"p) - if [ -z $(cat $clashdir/mac | grep -E "$macadd") ];then + if [ -z "$(cat $clashdir/mac | grep -E "$macadd")" ];then echo $macadd >> $clashdir/mac echo ----------------------------------------------- echo 已添加的mac地址: diff --git a/scripts/getdate.sh b/scripts/getdate.sh index 9078adb..4ee9f06 100644 --- a/scripts/getdate.sh +++ b/scripts/getdate.sh @@ -38,22 +38,22 @@ fi linkserver(){ echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[44m 实验性功能,遇问题请加TG群反馈:\033[42;30m t.me/clashfm \033[0m" +echo -e "\033[36m 感谢 https://github.com/tindy2013/subconverter \033[0m" echo 当前使用后端为:$server_link -echo 1 subconverter-web.now.sh +echo 1 subcon.dlj.tf echo 2 subconverter.herokuapp.com echo 3 subcon.py6.pw echo 4 api.dler.io echo 5 api.wcc.best -echo 6 skapi.cool echo ----------------------------------------------- echo 0 返回上级菜单 read -p "请输入对应数字 > " num -if [ -z "$num" ] || [[ $num -gt 6 ]];then +if [ -z "$num" ] || [[ $num -gt 5 ]];then echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m请输入正确的数字!\033[0m" elif [[ "$num" = 0 ]];then echo -elif [[ $num -le 6 ]];then +elif [[ $num -le 5 ]];then #将对应标记值写入mark sed -i '/server_link*/'d $ccfg sed -i "4i\server_link="$num"" $ccfg @@ -88,7 +88,7 @@ sed -i "1i\exclude=\'$exclude\'" $ccfg linkset } linkset(){ -if [ -n $Url ];then +if [ -n "$Url" ];then [ -z "$skip_cert" ] && skip_cert=已开启 echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[47;30m请检查输入的链接是否正确:\033[0m" @@ -174,7 +174,7 @@ do Url="$Url"\|"$url" fi i=$(($i+1)) - elif [ -z $url ];then + elif [ -z "$url" ];then [ -n "$Url" ] && linkset elif [[ $url == 0 ]];then echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -202,32 +202,30 @@ echo ----------------------------------------------- echo -e "\033[33m0 返回上级菜单\033[0m" echo ----------------------------------------------- read -p "请输入完整链接 > " Https -test=$(echo $Https | grep "://") +test=$(echo $Https | grep -iE "http.*://" ) Https=`echo ${Https/\ \(*\)/''}` #删除恶心的超链接内容 -#Https=`echo ${Https//\&/\%26}` #将分隔符 & 替换成Httpscode:%26 -if [ -n $Https ];then - if [ -n $test ];then - echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - echo -e 请检查输入的链接是否正确: - echo -e "\033[4m$Https\033[0m" - read -p "确认导入配置文件?原配置文件将被更名为config.yaml.bak![1/0] > " res - if [ "$res" = '1' ]; then - #将用户链接写入mark - sed -i '/Url=*/'d $ccfg - sed -i '/Https=*/'d $ccfg - sed -i "6i\Https=\'$Https\'" $ccfg - #获取在线yaml文件 - $clashdir/start.sh getyaml - start_over - exit; - fi - clashlink - fi +if [ -n "$Https" -a -n "$test" ];then + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + echo -e 请检查输入的链接是否正确: + echo -e "\033[4m$Https\033[0m" + read -p "确认导入配置文件?原配置文件将被更名为config.yaml.bak![1/0] > " res + if [ "$res" = '1' ]; then + #将用户链接写入mark + sed -i '/Url=*/'d $ccfg + sed -i '/Https=*/'d $ccfg + sed -i "6i\Https=\'$Https\'" $ccfg + #获取在线yaml文件 + $clashdir/start.sh getyaml + start_over + exit; + fi elif [[ $Https == 0 ]];then clashlink else echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - echo -e "\033[31m请输入正确的链接地址!!!\033[0m" + echo -e "\033[31m请输入正确的配置文件链接地址!!!\033[0m" + echo -e "\033[33m链接地址必须是http或者https开头的形式\033[0m" + clashlink fi } gettar(){ @@ -328,7 +326,7 @@ echo "(高级预览版) 内存占用更高" echo ----------------------------------------------- echo 0 返回上级菜单 read -p "请输入对应数字 > " num - if [ -z $num ]; then + if [ -z "$num" ]; then echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m请输入正确的数字!\033[0m" update @@ -518,7 +516,7 @@ echo -e " 3 Github源+clash代理(需开启clash服务)" echo -e " 4 自定义输入(请务必确保路径正确)" echo -e " 0 返回上级菜单" read -p "请输入对应数字 > " num -if [ -z $num ]; then +if [ -z "$num" ]; then echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m请输入正确的数字!\033[0m" update diff --git a/scripts/start.sh b/scripts/start.sh index 86db39b..2fd2da8 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -27,12 +27,11 @@ source $ccfg getyaml(){ #前后端订阅服务器地址索引,可在此处添加! Server=`sed -n ""$server_link"p"<