diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index b8c971d..bba8125 100644 Binary files a/bin/clashfm.tar.gz and b/bin/clashfm.tar.gz differ diff --git a/install_n.sh b/install_n.sh index 1152576..e68c5f4 100644 --- a/install_n.sh +++ b/install_n.sh @@ -28,10 +28,15 @@ webget(){ [ -z "$4" ] && redirect='-L' || redirect='' result=$(curl -w %{http_code} --connect-timeout 5 $progress $redirect -ko $1 $2) else - [ "$3" = "echooff" ] && progress='-q' || progress='-q --show-progress' + if wget --version > /dev/null 2>&1;then + [ "$3" = "echooff" ] && progress='-q' || progress='-q --show-progress' + [ "$4" = "rediroff" ] && redirect='--max-redirect=0' || redirect='' + certificate='--no-check-certificate' + timeout='--timeout=3' + fi [ "$3" = "echoon" ] && progress='' - [ -z "$4" ] && redirect='' || redirect='--max-redirect=0' - wget -Y on $progress $redirect --no-check-certificate --timeout=5 -O $1 $2 + [ "$3" = "echooff" ] && progress='-q' + wget $progress $redirect $certificate $timeout -O $1 $2 [ $? -eq 0 ] && result="200" fi } diff --git a/scripts/clash.sh b/scripts/clash.sh index 348bc46..90fec8e 100644 --- a/scripts/clash.sh +++ b/scripts/clash.sh @@ -489,18 +489,19 @@ localproxy(){ localproxy else local_proxy=已开启 - $clashdir/start.sh set_proxy $mix_port $db_port + setconfig local_proxy $local_proxy echo -e "\033[32m已经成功使用$local_type方式配置本机代理~\033[0m" - [ "$local_type" = "环境变量" ] && echo -e "\033[36m如未生效,请重新启动终端或重新连接SSH!\033[0m" && sleep 1 + [ "$local_type" = "环境变量" ] && $clashdir/start.sh set_proxy $mix_port $db_port &&echo -e "\033[36m如未生效,请重新启动终端或重新连接SSH!\033[0m" && sleep 1 [ "$local_type" = "iptables增强模式" ] && $clashdir/start.sh start fi else local_proxy=未开启 + setconfig local_proxy $local_proxy $clashdir/start.sh stop echo -e "\033[33m已经停用本机代理规则并停止clash服务!!\033[0m" [ "$local_type" = "环境变量" ] && echo -e "\033[36m如未生效,请重新启动终端或重新连接SSH!\033[0m" && sleep 1 fi - setconfig local_proxy $local_proxy + elif [ "$num" = 2 ]; then local_type="环境变量" setconfig local_type $local_type diff --git a/scripts/start.sh b/scripts/start.sh index 9e9cef5..b777c63 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -683,6 +683,7 @@ afstart(){ [ "$redir_mod" != "纯净模式" ] && [ "$dns_no" != "已禁用" ] && start_dns [ "$redir_mod" != "纯净模式" ] && [ "$redir_mod" != "Tun模式" ] && start_redir [ "$redir_mod" = "Redir模式" ] && [ "$tproxy_mod" = "已开启" ] && start_udp + [ "$local_proxy" = "已开启" ] && [ "$local_type" = "iptables增强模式" ] && start_output #标记启动时间 mark_time #设置本机代理