diff --git a/apps/shadowsocks/scripts/shadowsocks.sh b/apps/shadowsocks/scripts/shadowsocks.sh index b7bf6f4..f40bf18 100644 --- a/apps/shadowsocks/scripts/shadowsocks.sh +++ b/apps/shadowsocks/scripts/shadowsocks.sh @@ -149,6 +149,8 @@ get_config() { EOF fi fi + # 保存代理类型 + mbdb set ${appname}.main.proxy_type="$proxy_type" } @@ -644,6 +646,8 @@ start() { start_haveged + sleep 1 + start_main_process start_game_process @@ -697,7 +701,7 @@ status() { #if [ "$result" == '0' ] || [ "$http_status" != "200" ]; then result2=$(iptables -t nat -S | grep SHADOWSOCK) [ "$ssgena" == '1' ] && ssgflag=", 游戏节点: $ssgid($ssg_mode)" - if [ "$result1" -ge 2 ]; then + if [ "$result1" -ge 3 ]; then if [ -n "$result2" ]; then status="运行节点: $id($ss_mode)$ssgflag|1" else diff --git a/appstore/history/shadowsocks_linux_arm.tar.gz b/appstore/history/shadowsocks_linux_arm.tar.gz index a0f019d..896ecdb 100644 Binary files a/appstore/history/shadowsocks_linux_arm.tar.gz and b/appstore/history/shadowsocks_linux_arm.tar.gz differ diff --git a/appstore/history/shadowsocks_linux_mips.tar.gz b/appstore/history/shadowsocks_linux_mips.tar.gz index 6f52a39..10391e0 100644 Binary files a/appstore/history/shadowsocks_linux_mips.tar.gz and b/appstore/history/shadowsocks_linux_mips.tar.gz differ diff --git a/appstore/history/shadowsocks_linux_x86_64.tar.gz b/appstore/history/shadowsocks_linux_x86_64.tar.gz index 88490c7..7ddb7f2 100644 Binary files a/appstore/history/shadowsocks_linux_x86_64.tar.gz and b/appstore/history/shadowsocks_linux_x86_64.tar.gz differ diff --git a/appstore/shadowsocks_linux_arm.tar.gz b/appstore/shadowsocks_linux_arm.tar.gz index 161a185..5a949fa 100644 Binary files a/appstore/shadowsocks_linux_arm.tar.gz and b/appstore/shadowsocks_linux_arm.tar.gz differ diff --git a/appstore/shadowsocks_linux_mips.tar.gz b/appstore/shadowsocks_linux_mips.tar.gz index 485eb36..05a34e1 100644 Binary files a/appstore/shadowsocks_linux_mips.tar.gz and b/appstore/shadowsocks_linux_mips.tar.gz differ diff --git a/appstore/shadowsocks_linux_x86_64.tar.gz b/appstore/shadowsocks_linux_x86_64.tar.gz index d4bfacb..b57b0be 100644 Binary files a/appstore/shadowsocks_linux_x86_64.tar.gz and b/appstore/shadowsocks_linux_x86_64.tar.gz differ diff --git a/install.sh b/install.sh index 5694436..50d1fba 100644 --- a/install.sh +++ b/install.sh @@ -17,7 +17,7 @@ logsh "【Tools】" "请按任意键安装工具箱(Ctrl + C 退出)." read answer #check root # [ "$USER" != "root" ] && logsh "【Tools】" "请使用root用户安装工具箱!" && exit 1 -mburl="https://dev.tencent.com/u/monlor/p/MIXBOX-BETA/git/raw/master" +mburl="https://raw.githubusercontent.com/MIXBOX/master" mbtmp="/tmp/mbtmp" [ ! -d "${mbtmp}" ] && mkdir -p ${mbtmp} model=$(uname -ms | tr ' ' '_' | tr '[A-Z]' '[a-z]')