2019-01-05

This commit is contained in:
monlor
2019-01-05 22:28:26 +08:00
parent 2c25efd65d
commit da1ae87fad
12 changed files with 5 additions and 6 deletions

View File

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

View File

@@ -19,7 +19,7 @@ if [ "$result" == 0 ]; then
fi fi
logsh "【Tools】" "检查定时任务配置" logsh "【Tools】" "检查定时任务配置"
cru a monitor "*/5 * * * * ${mbroot}/scripts/monitor.sh" cru a monitor "*/3 * * * * ${mbroot}/scripts/monitor.sh"
logsh "【Tools】" "检查工具箱开机启动配置" logsh "【Tools】" "检查工具箱开机启动配置"
result=$(cat /etc/firewall.user 2> /dev/null | grep init.sh | wc -l) result=$(cat /etc/firewall.user 2> /dev/null | grep init.sh | wc -l)

View File

@@ -385,7 +385,6 @@ shadowsocks() {
done done
readsh "请选择其余设备代理模式(0.不走代理 1.科学上网)" "ss_proxy_default_mode" "1" readsh "请选择其余设备代理模式(0.不走代理 1.科学上网)" "ss_proxy_default_mode" "1"
checkread $ssproxy && mbdb set $appname.main.ss_proxy_default_mode="$ssproxy"
if [ -n "$(lsmod | grep TPROXY)" ]; then if [ -n "$(lsmod | grep TPROXY)" ]; then
readsh "请选择其余设备游戏模式(0.不走游戏 1.游戏加速)" "ss_game_default_mode" "1" readsh "请选择其余设备游戏模式(0.不走游戏 1.游戏加速)" "ss_game_default_mode" "1"
fi fi

View File

@@ -6,4 +6,4 @@ openport="1"
backupfiles="config/ssserver.conf,config/sscontrol.conf,config/customize_black.conf,config/customize_white.conf" backupfiles="config/ssserver.conf,config/sscontrol.conf,config/customize_black.conf,config/customize_white.conf"
appinfo="最好的翻墙工具,没有之一,还可以加速国内外游戏" appinfo="最好的翻墙工具,没有之一,还可以加速国内外游戏"
newinfo="修复回国模式的未添加ipset规则的bug修复其余设备运行模式一直显示科学上网的bug" newinfo="修复回国模式的未添加ipset规则的bug修复其余设备运行模式一直显示科学上网的bug"
version="0.0.6" version="0.0.7"

View File

@@ -667,7 +667,7 @@ start() {
/etc/init.d/dnsmasq restart /etc/init.d/dnsmasq restart
logsh "$service" "启动${appname}服务完成!" logsh "$service" "启动${appname}服务完成,启动失败可查看日志或多次重试"
# detect_process # detect_process

View File

@@ -17,7 +17,7 @@ logsh "【Tools】" "请按任意键安装工具箱(Ctrl + C 退出)."
read answer read answer
#check root #check root
# [ "$USER" != "root" ] && logsh "【Tools】" "请使用root用户安装工具箱" && exit 1 # [ "$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" mbtmp="/tmp/mbtmp"
[ ! -d "${mbtmp}" ] && mkdir -p ${mbtmp} [ ! -d "${mbtmp}" ] && mkdir -p ${mbtmp}
model=$(uname -ms | tr ' ' '_' | tr '[A-Z]' '[a-z]') model=$(uname -ms | tr ' ' '_' | tr '[A-Z]' '[a-z]')