From 420aeeba3d4cfd85501081ac0ae3458be39a9f44 Mon Sep 17 00:00:00 2001 From: juewuy Date: Wed, 7 Oct 2020 16:31:39 +0800 Subject: [PATCH] =?UTF-8?q?v1.0.0beta13fix2=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?= =?UTF-8?q?=20~=E4=BF=AE=E6=94=B9=E4=BA=86=E6=9C=AC=E6=9C=BA=E4=BB=A3?= =?UTF-8?q?=E7=90=86=E5=AE=9E=E7=8E=B0=E6=96=B9=E5=BC=8F=EF=BC=8C=E7=8E=B0?= =?UTF-8?q?=E5=9C=A8=E4=BC=9A=E9=9A=8F=E7=9D=80clash=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=81=9C=E6=AD=A2=E8=80=8C=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/clashfm.tar.gz | Bin 17775 -> 17865 bytes bin/version | 2 +- scripts/clash.sh | 13 +++++-------- scripts/start.sh | 16 ++++++++++++++++ 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index 1d4a4d19f1e4d5443c820ff753a04d6191658b8c..04bc2ba255e24cd6bd32e523bb0aea3c72b057fb 100644 GIT binary patch delta 17576 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
  • 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 PZ<60XWOz{206qZ#AI+f1 delta 17503 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 diff --git a/bin/version b/bin/version index 1d41124ab..ca45d1739 100644 --- a/bin/version +++ b/bin/version @@ -1,4 +1,4 @@ GeoIP_v=20201001 clash_v=1.1.0 clashpre_v=2020.09.27 -versionsh=1.0.0beta13fix1 +versionsh=1.0.0beta13fix2 diff --git a/scripts/clash.sh b/scripts/clash.sh index 01c70d7b3..5cf6fd614 100644 --- a/scripts/clash.sh +++ b/scripts/clash.sh @@ -686,21 +686,18 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then if [ "$local_proxy" = "未开启" ] > /dev/null 2>&1; then sed -i "1i\local_proxy=已开启" $ccfg local_proxy=已开启 - echo 'export http_proxy=http://127.0.0.1:'"$mix_port" >> /etc/profile - echo 'export https_proxy=$http_proxy' >> /etc/profile - echo 'export HTTP_PROXY=$http_proxy' >> /etc/profile - echo 'export HTTPS_PROXY=$http_proxy' >> /etc/profile + source $clashdir/start.sh + set_proxy echo -e "\033[32m已经将代理参数写入环境变量~\033[0m" echo -e "\033[36m如未生效,请重新登录或者重启设备!\033[0m" sleep 1 else sed -i "1i\local_proxy=未开启" $ccfg - sed -i '/http*_proxy/'d /etc/profile - sed -i '/HTTP*_PROXY/'d /etc/profile - echo -e "\033[33m已经将代理参数从环境变量移除!!\033[0m" local_proxy=未开启 + source $clashdir/start.sh + unset_proxy + echo -e "\033[33m已经将代理参数从环境变量移除!!\033[0m" fi - source /etc/profile > /dev/null 2>&1 clashadv elif [[ $num == 5 ]]; then setport diff --git a/scripts/start.sh b/scripts/start.sh index 2fd2da857..8480567ee 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -282,6 +282,18 @@ daemon(){ echo 请进入定时任务菜单手动指定系统定时任务文件路径!!! fi } +set_proxy(){ + echo 'export http_proxy=http://127.0.0.1:'"$mix_port" >> /etc/profile + echo 'export https_proxy=$http_proxy' >> /etc/profile + echo 'export HTTP_PROXY=$http_proxy' >> /etc/profile + echo 'export HTTPS_PROXY=$http_proxy' >> /etc/profile + source /etc/profile > /dev/null 2>&1 +} +unset_proxy(){ + sed -i '/http*_proxy/'d /etc/profile + sed -i '/HTTP*_PROXY/'d /etc/profile + source /etc/profile > /dev/null 2>&1 +} afstart(){ #读取配置文件 getconfig @@ -291,6 +303,8 @@ afstart(){ [ "$redir_mod" != "纯净模式" ] && [ "$redir_mod" != "Tun模式" ] && start_redir #标记启动时间 mark_time + #设置本机代理 + [ "$local_proxy" = "已开启" ] && set_proxy } case "$1" in @@ -328,6 +342,8 @@ stop) killall -9 clash >/dev/null 2>&1 #清理iptables stop_iptables + #禁用本机代理 + [ "$local_proxy" = "已开启" ] && unset_proxy ;; restart) $0 stop