diff --git a/applist.txt b/applist.txt index 8cb9c28..cc28e9a 100644 --- a/applist.txt +++ b/applist.txt @@ -1,13 +1,13 @@ aliddns|动态将你的路由器IP绑定到域名||0.0.2|AliDDNS|linux_arm,linux_mips,linux_x86_64,darwin_x86_64 aria2|Linux下一款高效的下载工具|更新了R3G的二进制文件|0.0.2|Aria2|linux_arm,linux_mips,linux_x86_64 -baidupcs|第三方百度网盘web客户端,基于Go语言||0.0.2|BaiduPCS|linux_arm,linux_mips,linux_x86_64,darwin_x86_64 +baidupcs|第三方百度网盘web客户端,基于Go语言|更新arm和mips程序,作者更新了移动ui|0.0.3|BaiduPCS|linux_arm,linux_mips,linux_x86_64,darwin_x86_64 dropbear|移植小米的SSH功能到工具箱|添加备份功能支持|0.0.2|DropBear|linux_arm,linux_mips easyexplorer|一款跨设备的P2P文件同步工具||0.0.2|EasyExplorer|linux_arm,linux_x86_64,darwin_x86_64 entware|一款开源且强大的包管理工具,许多功能都通过它来实现|增加了启动ONMP安装程序的选项|0.0.2|Entware|linux_arm,linux_mips,linux_x86_64 fastdick|迅雷快鸟,快带提速工具||0.0.2|FastDick|linux_arm,linux_mips,linux_x86_64,darwin_x86_64 filebrowser|Web文件浏览器||0.0.2|FileBrowser|linux_arm,linux_mips,linux_x86_64,darwin_x86_64 firewall|防火墙端口开放插件|支持添加多种端口号类型|0.0.2|FireWall|linux_arm,linux_mips,linux_x86_64 -frpc|内网穿透工具,相对于ngrok资源占用较多|修改默认的版本识别,从二进制文件获取默认版本|0.0.4|Frpc|linux_arm,linux_mips,linux_x86_64,darwin_x86_64 +frpc|内网穿透工具,相对于ngrok资源占用较多|修复自定义域名配置错误|0.0.5|Frpc|linux_arm,linux_mips,linux_x86_64,darwin_x86_64 frps|内网穿透工具Frp服务端|frp程序更新到0.21.0|0.0.2|Frps|linux_arm,linux_mips,linux_x86_64,darwin_x86_64 httpfile|搭建简单的web文件浏览页面||0.0.2|HttpFile|linux_arm,linux_mips,linux_x86_64 jetbrains|快速搭建JetBrains激活服务器||0.0.2|JetBrains|linux_arm,linux_mips,linux_x86_64,darwin_x86_64 @@ -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|最好的翻墙工具,没有之一,还可以加速国内外游戏|修复回国模式的未添加ipset规则的bug|0.0.5|ShadowSocks|linux_arm,linux_mips,linux_x86_64 +shadowsocks|最好的翻墙工具,没有之一,还可以加速国内外游戏|修复回国模式的未添加ipset规则的bug,修复其余设备运行模式一直显示科学上网的bug|0.0.6|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 diff --git a/apps/baidupcs/bin/baidupcs_linux_arm b/apps/baidupcs/bin/baidupcs_linux_arm index e0ed0e8..177f54c 100755 Binary files a/apps/baidupcs/bin/baidupcs_linux_arm and b/apps/baidupcs/bin/baidupcs_linux_arm differ diff --git a/apps/baidupcs/bin/baidupcs_linux_mips b/apps/baidupcs/bin/baidupcs_linux_mips index 3ea5f35..574912b 100755 Binary files a/apps/baidupcs/bin/baidupcs_linux_mips and b/apps/baidupcs/bin/baidupcs_linux_mips differ diff --git a/apps/baidupcs/config/baidupcs.uci b/apps/baidupcs/config/baidupcs.uci index 0f70f7b..46fb510 100644 --- a/apps/baidupcs/config/baidupcs.uci +++ b/apps/baidupcs/config/baidupcs.uci @@ -4,5 +4,5 @@ needver="0.0.1" backupfiles="" supports="linux_arm,linux_mips,linux_x86_64,darwin_x86_64" appinfo="第三方百度网盘web客户端,基于Go语言" -newinfo="" -version="0.0.2" +newinfo="更新arm和mips程序,作者更新了移动ui" +version="0.0.3" diff --git a/apps/frpc/config/frpc.uci b/apps/frpc/config/frpc.uci index 214a6a2..77d0d79 100644 --- a/apps/frpc/config/frpc.uci +++ b/apps/frpc/config/frpc.uci @@ -3,5 +3,5 @@ appname="frpc" needver="0.0.1" supports="linux_arm,linux_mips,linux_x86_64,darwin_x86_64" appinfo="内网穿透工具,相对于ngrok资源占用较多" -newinfo="修改默认的版本识别,从二进制文件获取默认版本" -version="0.0.4" +newinfo="修复自定义域名配置错误" +version="0.0.5" diff --git a/apps/frpc/scripts/frpc.sh b/apps/frpc/scripts/frpc.sh index ababce6..7a05df3 100644 --- a/apps/frpc/scripts/frpc.sh +++ b/apps/frpc/scripts/frpc.sh @@ -62,7 +62,7 @@ set_config() { echo "subdomain = $domain" >> ${mbroot}/apps/${appname}/config/${appname}.conf logsh "【$service】" "加载${appname}配置:【$name】启动为http/https子域名模式,域名:[$domain]" else - echo "custom_domain = $domain" >> ${mbroot}/apps/${appname}/config/${appname}.conf + echo "custom_domains = $domain" >> ${mbroot}/apps/${appname}/config/${appname}.conf logsh "【$service】" "加载${appname}配置:【$name】启动为http/https自定义域名模式,域名:[$domain]" fi fi diff --git a/apps/shadowsocks/config/mixbox.conf b/apps/shadowsocks/config/mixbox.conf index b587273..d2afe89 100644 --- a/apps/shadowsocks/config/mixbox.conf +++ b/apps/shadowsocks/config/mixbox.conf @@ -332,7 +332,7 @@ shadowsocks() { esac echo "设备[$name]运行模式为: $mode" done - mode=$(mbdb get ${appname}.main.ss_acl_default_mode) + mode=$(mbdb get ${appname}.main.ss_proxy_default_mode) case "$mode" in 0) mode="不走代理" ;; 1) mode="科学上网" ;; diff --git a/apps/shadowsocks/config/shadowsocks.uci b/apps/shadowsocks/config/shadowsocks.uci index ae3770a..818839a 100644 --- a/apps/shadowsocks/config/shadowsocks.uci +++ b/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="修复回国模式的未添加ipset规则的bug" -version="0.0.5" +newinfo="修复回国模式的未添加ipset规则的bug,修复其余设备运行模式一直显示科学上网的bug" +version="0.0.6" diff --git a/appstore/baidupcs_darwin_x86_64.tar.gz b/appstore/baidupcs_darwin_x86_64.tar.gz index 90d3836..7759e7c 100644 Binary files a/appstore/baidupcs_darwin_x86_64.tar.gz and b/appstore/baidupcs_darwin_x86_64.tar.gz differ diff --git a/appstore/baidupcs_linux_arm.tar.gz b/appstore/baidupcs_linux_arm.tar.gz index 6b20cbc..f7c7901 100644 Binary files a/appstore/baidupcs_linux_arm.tar.gz and b/appstore/baidupcs_linux_arm.tar.gz differ diff --git a/appstore/baidupcs_linux_mips.tar.gz b/appstore/baidupcs_linux_mips.tar.gz index 18373e3..20e32e6 100644 Binary files a/appstore/baidupcs_linux_mips.tar.gz and b/appstore/baidupcs_linux_mips.tar.gz differ diff --git a/appstore/baidupcs_linux_x86_64.tar.gz b/appstore/baidupcs_linux_x86_64.tar.gz index 771029a..21719f9 100644 Binary files a/appstore/baidupcs_linux_x86_64.tar.gz and b/appstore/baidupcs_linux_x86_64.tar.gz differ diff --git a/appstore/frpc_darwin_x86_64.tar.gz b/appstore/frpc_darwin_x86_64.tar.gz index 25c6234..8dd74d8 100644 Binary files a/appstore/frpc_darwin_x86_64.tar.gz and b/appstore/frpc_darwin_x86_64.tar.gz differ diff --git a/appstore/frpc_linux_arm.tar.gz b/appstore/frpc_linux_arm.tar.gz index f0c8978..f05c855 100644 Binary files a/appstore/frpc_linux_arm.tar.gz and b/appstore/frpc_linux_arm.tar.gz differ diff --git a/appstore/frpc_linux_mips.tar.gz b/appstore/frpc_linux_mips.tar.gz index cd5560e..10a2894 100644 Binary files a/appstore/frpc_linux_mips.tar.gz and b/appstore/frpc_linux_mips.tar.gz differ diff --git a/appstore/frpc_linux_x86_64.tar.gz b/appstore/frpc_linux_x86_64.tar.gz index 154ec15..9b0dadb 100644 Binary files a/appstore/frpc_linux_x86_64.tar.gz and b/appstore/frpc_linux_x86_64.tar.gz differ diff --git a/appstore/history/baidupcs_darwin_x86_64.tar.gz b/appstore/history/baidupcs_darwin_x86_64.tar.gz index 551981c..90d3836 100644 Binary files a/appstore/history/baidupcs_darwin_x86_64.tar.gz and b/appstore/history/baidupcs_darwin_x86_64.tar.gz differ diff --git a/appstore/history/baidupcs_linux_arm.tar.gz b/appstore/history/baidupcs_linux_arm.tar.gz index 3ec9d79..6b20cbc 100644 Binary files a/appstore/history/baidupcs_linux_arm.tar.gz and b/appstore/history/baidupcs_linux_arm.tar.gz differ diff --git a/appstore/history/baidupcs_linux_mips.tar.gz b/appstore/history/baidupcs_linux_mips.tar.gz index 10683d9..18373e3 100644 Binary files a/appstore/history/baidupcs_linux_mips.tar.gz and b/appstore/history/baidupcs_linux_mips.tar.gz differ diff --git a/appstore/history/baidupcs_linux_x86_64.tar.gz b/appstore/history/baidupcs_linux_x86_64.tar.gz index 848948c..771029a 100644 Binary files a/appstore/history/baidupcs_linux_x86_64.tar.gz and b/appstore/history/baidupcs_linux_x86_64.tar.gz differ diff --git a/appstore/history/frpc_darwin_x86_64.tar.gz b/appstore/history/frpc_darwin_x86_64.tar.gz index 648beca..25c6234 100644 Binary files a/appstore/history/frpc_darwin_x86_64.tar.gz and b/appstore/history/frpc_darwin_x86_64.tar.gz differ diff --git a/appstore/history/frpc_linux_arm.tar.gz b/appstore/history/frpc_linux_arm.tar.gz index a315e4c..f0c8978 100644 Binary files a/appstore/history/frpc_linux_arm.tar.gz and b/appstore/history/frpc_linux_arm.tar.gz differ diff --git a/appstore/history/frpc_linux_mips.tar.gz b/appstore/history/frpc_linux_mips.tar.gz index c5efa67..cd5560e 100644 Binary files a/appstore/history/frpc_linux_mips.tar.gz and b/appstore/history/frpc_linux_mips.tar.gz differ diff --git a/appstore/history/frpc_linux_x86_64.tar.gz b/appstore/history/frpc_linux_x86_64.tar.gz index 8da90ef..154ec15 100644 Binary files a/appstore/history/frpc_linux_x86_64.tar.gz and b/appstore/history/frpc_linux_x86_64.tar.gz differ diff --git a/appstore/history/shadowsocks_linux_arm.tar.gz b/appstore/history/shadowsocks_linux_arm.tar.gz index 6831841..a0f019d 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 c5fbe9f..6f52a39 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 d40745b..88490c7 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 a0f019d..161a185 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 6f52a39..485eb36 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 88490c7..d4bfacb 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]')