xm/ShellCrash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.0.0beta7fix

Browse Source 
~修复手动更新订阅功能出错的bug
~调整本机代理功能设置
This commit is contained in:
juewuy
2020-09-19 22:06:01 +08:00
parent 9dc284572b
commit cf621a47ac
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/clash.sh
View File

@@ -240,8 +240,7 @@ elif [[ $num == 7 ]];then
echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
read -p "确认更新配置文件？[1/0] > " res read -p "确认更新配置文件？[1/0] > " res
if [ "$res" = '1' ]; then if [ "$res" = '1' ]; then
source $clashdir/getdate.sh $clashdir/start.sh getyaml
getyaml
fi fi
clashlink clashlink
fi fi
@@ -591,15 +590,18 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then
sed -i "1i\local_proxy=已开启" $ccfg sed -i "1i\local_proxy=已开启" $ccfg
local_proxy=已开启 local_proxy=已开启
echo 'export http_proxy=http://127.0.0.1:7890' >> /etc/profile echo 'export http_proxy=http://127.0.0.1:7890' >> /etc/profile
echo 'export https_proxy=http://127.0.0.1:7890' >> /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
echo -e "\033[32m已经将代理参数写入环境变量~\033[0m" echo -e "\033[32m已经将代理参数写入环境变量~\033[0m"
echo -e "\033[36m如未生效，请重新登录或者重启设备！\033[0m" echo -e "\033[36m如未生效，请重新登录或者重启设备！\033[0m"
sleep 1 sleep 1
else else
sed -i "1i\local_proxy=未开启" $ccfg 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" echo -e "\033[33m已经将代理参数从环境变量移除！！\033[0m"
local_proxy=未开启 local_proxy=未开启
sed -i '/http*_proxy/'d /etc/profile
fi fi
source /etc/profile > /dev/null 2>&1 source /etc/profile > /dev/null 2>&1
clashadv clashadv