diff --git a/bin/clash.net/clash-linux-386 b/bin/clash.net/clash-linux-386 new file mode 100644 index 0000000..76747fd Binary files /dev/null and b/bin/clash.net/clash-linux-386 differ diff --git a/bin/clash.net/clash-linux-amd64 b/bin/clash.net/clash-linux-amd64 new file mode 100644 index 0000000..35b2649 Binary files /dev/null and b/bin/clash.net/clash-linux-amd64 differ diff --git a/bin/clash.net/clash-linux-armv5 b/bin/clash.net/clash-linux-armv5 new file mode 100644 index 0000000..110162a Binary files /dev/null and b/bin/clash.net/clash-linux-armv5 differ diff --git a/bin/clash.net/clash-linux-armv7 b/bin/clash.net/clash-linux-armv7 new file mode 100644 index 0000000..221cd32 Binary files /dev/null and b/bin/clash.net/clash-linux-armv7 differ diff --git a/bin/clash.net/clash-linux-armv8 b/bin/clash.net/clash-linux-armv8 new file mode 100644 index 0000000..fa9948f Binary files /dev/null and b/bin/clash.net/clash-linux-armv8 differ diff --git a/bin/clash.net/clash-linux-mips-softfloat b/bin/clash.net/clash-linux-mips-softfloat new file mode 100644 index 0000000..9c87213 Binary files /dev/null and b/bin/clash.net/clash-linux-mips-softfloat differ diff --git a/bin/clash.net/clash-linux-mipsle-hardfloat b/bin/clash.net/clash-linux-mipsle-hardfloat new file mode 100644 index 0000000..6242701 Binary files /dev/null and b/bin/clash.net/clash-linux-mipsle-hardfloat differ diff --git a/bin/clash.net/clash-linux-mipsle-softfloat b/bin/clash.net/clash-linux-mipsle-softfloat new file mode 100644 index 0000000..39b7ff7 Binary files /dev/null and b/bin/clash.net/clash-linux-mipsle-softfloat differ diff --git a/bin/version b/bin/version index e325cc9..f43f464 100644 --- a/bin/version +++ b/bin/version @@ -2,3 +2,4 @@ GeoIP_v=20210709 clash_v=1.6.5 clashpre_v=2021.07.03 versionsh=1.4.3 +clash.net_v=1.7.3 diff --git a/scripts/clash.sh b/scripts/clash.sh index 5a32f84..9072893 100644 --- 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 + elif [ "$num" = 3 ]; then + mv -f $ccfg $ccfg.bak + echo -e "\033[32m脚本设置已重置!(旧文件已备份!)\033[0m" fi - clashadv + echo -e "\033[33m请重新启动脚本!\033[0m" + exit 0 else errornum diff --git a/scripts/getdate.sh b/scripts/getdate.sh index 29fe1f4..5bbd7b0 100644 --- a/scripts/getdate.sh +++ b/scripts/getdate.sh @@ -428,7 +428,7 @@ getcore(){ else echo -e "\033[32m$clashcore核心下载成功!\033[0m" mv -f /tmp/clash.new $bindir/clash - chmod 777 $bindir/clash #授予权限 + chmod 777 $bindir/clash #授予权限 setconfig clashcore $clashcore setconfig clashv $version fi @@ -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=$clash.net_v + getcore + elif [ "$num" = 4 ]; then setcpucore setcore else @@ -873,6 +880,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 +914,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