v1.0.0beta13fix3

~修复了使用systemd无法正常启动进程的bug
This commit is contained in:
juewuy
2020-10-09 19:21:28 +08:00
parent 420aeeba3d
commit cb413622eb
2 changed files with 11 additions and 10 deletions

View File

@@ -386,13 +386,13 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then
echo ----------------------------------------------- echo -----------------------------------------------
echo " 1 Redir模式CPU以及内存占用较低" echo " 1 Redir模式CPU以及内存占用较低"
echo " 但不支持UDP流量转发" echo " 但不支持UDP流量转发"
echo " 日常使用推荐此模式" echo " 适合非游戏用户使用"
echo " 2 Tun模式 支持UDP转发且延迟低" echo " 2 Tun模式 支持UDP转发且延迟低"
echo " CPU及内存占用更高" echo " CPU占用极高只支持fake-ip模式"
echo " 且不支持redir-host" echo " 适合游戏用户、非大流量用户"
echo " 3 混合模式: 使用Tun转发UPD流量" echo " 3 混合模式: 使用redir转发TCPTun转发UPD"
echo " CPU和内存占用高" echo " 速度较快,内存占用高"
echo " 不推荐使用redir-host" echo " 适合游戏用户、综合用户"
echo " 4 纯净模式: 不设置iptables静态路由" echo " 4 纯净模式: 不设置iptables静态路由"
echo " 必须手动配置http/sock5代理" echo " 必须手动配置http/sock5代理"
echo " 0 返回上级菜单" echo " 0 返回上级菜单"

View File

@@ -82,7 +82,7 @@ if [ "$result" != "200" ];then
read -p "是否更换后端地址后重试?[1/0] > " res read -p "是否更换后端地址后重试?[1/0] > " res
if [ "$res" = '1' ]; then if [ "$res" = '1' ]; then
sed -i '/server_link=*/'d $ccfg sed -i '/server_link=*/'d $ccfg
if [[ $server_link -ge 6 ]]; then if [[ $server_link -ge 5 ]]; then
server_link=0 server_link=0
fi fi
server_link=$(($server_link + 1)) server_link=$(($server_link + 1))
@@ -287,12 +287,10 @@ set_proxy(){
echo 'export https_proxy=$http_proxy' >> /etc/profile echo 'export https_proxy=$http_proxy' >> /etc/profile
echo 'export HTTP_PROXY=$http_proxy' >> /etc/profile echo 'export HTTP_PROXY=$http_proxy' >> /etc/profile
echo 'export HTTPS_PROXY=$http_proxy' >> /etc/profile echo 'export HTTPS_PROXY=$http_proxy' >> /etc/profile
source /etc/profile > /dev/null 2>&1
} }
unset_proxy(){ unset_proxy(){
sed -i '/http*_proxy/'d /etc/profile sed -i '/http*_proxy/'d /etc/profile
sed -i '/HTTP*_PROXY/'d /etc/profile sed -i '/HTTP*_PROXY/'d /etc/profile
source /etc/profile > /dev/null 2>&1
} }
afstart(){ afstart(){
#读取配置文件 #读取配置文件
@@ -305,6 +303,7 @@ afstart(){
mark_time mark_time
#设置本机代理 #设置本机代理
[ "$local_proxy" = "已开启" ] && set_proxy [ "$local_proxy" = "已开启" ] && set_proxy
} }
case "$1" in case "$1" in
@@ -357,3 +356,5 @@ daemon)
daemon daemon
;; ;;
esac esac
exit 0