2019-01-04

applist.txt

@@ -19,7 +19,7 @@ mixbox|一款支持多平台，多架构的Shell工具箱|修复由于mbdb导致
 ngrok|轻量级的内网穿透工具||0.0.2|Ngrok|linux_arm,linux_mips
 pptpd|简单但并不安全的VPN服务器||0.0.2|PPTPD|linux_arm,linux_mips,linux_x86_64
 qiandao|koolshare merlin 自动签到程序||0.0.2|QianDao|linux_arm,linux_x86_64
-shadowsocks|最好的翻墙工具，没有之一，还可以加速国内外游戏|新增smartdns功能|0.0.4|ShadowSocks|linux_arm,linux_mips,linux_x86_64
+shadowsocks|最好的翻墙工具，没有之一，还可以加速国内外游戏|修复回国模式的未添加ipset规则的bug|0.0.5|ShadowSocks|linux_arm,linux_mips,linux_x86_64
 smartdns|DNS加速工具，从多个上游DNS服务器查询，避免DS污染|更新smartdns程序版本|0.0.3|SmartDNS|linux_arm,linux_mips,linux_x86_64
 ssserver|快速搭建ss服务端程序||0.0.2|SSServer|linux_arm,linux_x86_64
 tinyproxy|轻量级的Http代理工具||0.0.2|TinyProxy|linux_arm,linux_mips,linux_x86_64

apps/shadowsocks/config/shadowsocks.uci

@@ -5,5 +5,5 @@ supports="linux_arm,linux_mips,linux_x86_64"
 openport="1"
 backupfiles="config/ssserver.conf,config/sscontrol.conf,config/customize_black.conf,config/customize_white.conf"
 appinfo="最好的翻墙工具，没有之一，还可以加速国内外游戏"
-newinfo="新增smartdns功能"
-version="0.0.4"
+newinfo="修复回国模式的未添加ipset规则的bug"
+version="0.0.5"

apps/shadowsocks/config/version.txt

@@ -1 +0,0 @@
-2.0.1

apps/shadowsocks/scripts/shadowsocks.sh

@@ -349,13 +349,14 @@ ipset_rules() {
 			ipset -! add customize_white ${line} &> /dev/null
 		fi
 	done 
-	echo "server=/.apple.com/$CDN#53" >> ${mbtmp}/wblist.conf
-	echo "ipset=/.apple.com/customize_white" >> ${mbtmp}/wblist.conf
-	echo "server=/.microsoft.com/$CDN#53" >> ${mbtmp}/wblist.conf
-	echo "ipset=/.microsoft.com/customize_white" >> ${mbtmp}/wblist.conf
-	
+	if [ "$ss_mode" != "homemode" ]; then
+		echo "server=/.apple.com/$CDN#53" >> ${mbtmp}/wblist.conf
+		echo "ipset=/.apple.com/customize_white" >> ${mbtmp}/wblist.conf
+		echo "server=/.microsoft.com/$CDN#53" >> ${mbtmp}/wblist.conf
+		echo "ipset=/.microsoft.com/customize_white" >> ${mbtmp}/wblist.conf
+	fi
 	#黑白名单规则
-	if [ "$ss_mode" = "whitelist" -o "$ssg_mode" = "frgame" ]; then
+	if [ "$ss_mode" = "whitelist" -o "$ssg_mode" = "frgame" -o "$ss_mode" = "homemode" ]; then
 		sed -e "s/^/-A nogfwnet &/g" -e "1 i\-N nogfwnet hash:net" ${mbroot}/apps/${appname}/config/chnroute.txt | ipset -R -! 
 	elif [ "$ss_mode" = "gfwlist" -o "$ssg_mode" = "cngame" ]; then
 		cp -rf ${mbroot}/apps/${appname}/config/gfwlist.conf ${mbtmp}/gfwlist.conf

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]')