diff --git a/apps/fastdick/scripts/fastdick.sh b/apps/fastdick/scripts/fastdick.sh index e358f28..bcc546e 100644 --- a/apps/fastdick/scripts/fastdick.sh +++ b/apps/fastdick/scripts/fastdick.sh @@ -30,7 +30,7 @@ start () { logsh "【$service】" "正在启动${appname}服务... " # open_port # write_firewall_start - nohup ${mbroot}/apps/${appname}/bin/${appname} &> ${mbroot}/var/log/${appname}.log & + daemon ${mbroot}/apps/${appname}/bin/${appname} logsh "【$service】" "启动${appname}服务完成!" diff --git a/apps/mixbox/bin/base b/apps/mixbox/bin/base index 48580f0..9e09e24 100644 --- a/apps/mixbox/bin/base +++ b/apps/mixbox/bin/base @@ -194,7 +194,11 @@ remove_firewall_start(){ daemon() { local binname="$(basename "${1}")" - nohup $@ &> ${mbroot}/var/log/${binname}.log & + if type nohup >/dev/null 2>&1; then + nohup $@ &> ${mbroot}/var/log/${binname}.log & + else + $@ &> ${mbroot}/var/log/${binname}.log & + fi return $? } diff --git a/apps/mixbox/config/mixbox.uci b/apps/mixbox/config/mixbox.uci index f36ece5..aac6e15 100644 --- a/apps/mixbox/config/mixbox.uci +++ b/apps/mixbox/config/mixbox.uci @@ -1,7 +1,7 @@ service="MIXBOX" appname="mixbox" needver="" -supports="linux_arm,linux_mips,linux_x86_64" +supports="linux_aarch64,linux_arm,linux_mips,linux_x86_64" appinfo="一款支持多平台,多架构的Shell工具箱" newinfo="修复插件列表为空的bug" -version="0.1.9.10" +version="0.1.9.11" diff --git a/apps/shadowsocks/bin/dns2socks_linux_aarch64 b/apps/shadowsocks/bin/dns2socks_linux_aarch64 new file mode 100644 index 0000000..d8a9f40 Binary files /dev/null and b/apps/shadowsocks/bin/dns2socks_linux_aarch64 differ diff --git a/apps/shadowsocks/bin/haproxy_linux_aarch64 b/apps/shadowsocks/bin/haproxy_linux_aarch64 new file mode 100755 index 0000000..c2c14ad Binary files /dev/null and b/apps/shadowsocks/bin/haproxy_linux_aarch64 differ diff --git a/apps/shadowsocks/bin/haveged_linux_aarch64 b/apps/shadowsocks/bin/haveged_linux_aarch64 new file mode 100755 index 0000000..a5152a8 Binary files /dev/null and b/apps/shadowsocks/bin/haveged_linux_aarch64 differ diff --git a/apps/shadowsocks/bin/kcptun_linux_aarch64 b/apps/shadowsocks/bin/kcptun_linux_aarch64 new file mode 100755 index 0000000..ddee169 Binary files /dev/null and b/apps/shadowsocks/bin/kcptun_linux_aarch64 differ diff --git a/apps/shadowsocks/bin/obfs-local_linux_aarch64 b/apps/shadowsocks/bin/obfs-local_linux_aarch64 new file mode 100644 index 0000000..b0c4641 Binary files /dev/null and b/apps/shadowsocks/bin/obfs-local_linux_aarch64 differ diff --git a/apps/shadowsocks/bin/ss-local_linux_aarch_64 b/apps/shadowsocks/bin/ss-local_linux_aarch_64 new file mode 100755 index 0000000..754453c Binary files /dev/null and b/apps/shadowsocks/bin/ss-local_linux_aarch_64 differ diff --git a/apps/shadowsocks/bin/ss-redir_linux_aarch64 b/apps/shadowsocks/bin/ss-redir_linux_aarch64 new file mode 100755 index 0000000..8a27a49 Binary files /dev/null and b/apps/shadowsocks/bin/ss-redir_linux_aarch64 differ diff --git a/apps/shadowsocks/bin/ssr-local_linux_aarch64 b/apps/shadowsocks/bin/ssr-local_linux_aarch64 new file mode 100644 index 0000000..a260951 Binary files /dev/null and b/apps/shadowsocks/bin/ssr-local_linux_aarch64 differ diff --git a/apps/shadowsocks/bin/ssr-redir_linux_aarch64 b/apps/shadowsocks/bin/ssr-redir_linux_aarch64 new file mode 100644 index 0000000..478b0c7 Binary files /dev/null and b/apps/shadowsocks/bin/ssr-redir_linux_aarch64 differ diff --git a/apps/shadowsocks/config/shadowsocks.uci b/apps/shadowsocks/config/shadowsocks.uci index 75e95d8..54940f5 100644 --- a/apps/shadowsocks/config/shadowsocks.uci +++ b/apps/shadowsocks/config/shadowsocks.uci @@ -1,9 +1,9 @@ service=ShadowSocks appname="shadowsocks" needver="0.0.1" -supports="linux_arm,linux_mips,linux_x86_64" +supports="linux_aarch64,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="v2ray配置测试错误也不停止运行程序" -version="0.1.9" +version="0.1.10" diff --git a/apps/shadowsocks/scripts/shadowsocks.sh b/apps/shadowsocks/scripts/shadowsocks.sh index 2646e37..53cec69 100644 --- a/apps/shadowsocks/scripts/shadowsocks.sh +++ b/apps/shadowsocks/scripts/shadowsocks.sh @@ -401,6 +401,7 @@ ipset_rules() { echo "ipset=/.microsoft.com/customize_white" >> ${mbtmp}/wblist.conf fi #黑白名单规则 + test ! -d /tmp/etc/dnsmasq.d && mkdir -p /tmp/etc/dnsmasq.d 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 diff --git a/apps/webshell/bin/webshell_linux_aarch64 b/apps/webshell/bin/webshell_linux_aarch64 new file mode 100755 index 0000000..81f69ff Binary files /dev/null and b/apps/webshell/bin/webshell_linux_aarch64 differ diff --git a/apps/webshell/config/webshell.uci b/apps/webshell/config/webshell.uci index 533b6d6..7526ba1 100644 --- a/apps/webshell/config/webshell.uci +++ b/apps/webshell/config/webshell.uci @@ -1,7 +1,7 @@ service="WebShell" appname="webshell" needver="0.0.1" -supports="linux_arm,linux_mips,linux_x86_64" +supports="linux_aarch64,linux_arm,linux_mips,linux_x86_64" appinfo="网页ssh工具,可在网页上管理路由器" newinfo="" -version="0.0.2" +version="0.0.3" diff --git a/install.sh b/install.sh index d77c84f..b8d0c31 100644 --- a/install.sh +++ b/install.sh @@ -21,6 +21,7 @@ mburl="https://monlor.coding.net/p/mbfiles/d/mbfiles/git/lfs/master" mbtmp="/tmp/mbtmp" [ ! -d "${mbtmp}" ] && mkdir -p ${mbtmp} model=$(uname -ms | tr ' ' '_' | tr '[A-Z]' '[a-z]') +[ -n "$(echo $model | grep -E "linux.*aarch64.*")" ] && model="linux_aarch64" [ -n "$(echo $model | grep -E "linux.*arm.*")" ] && model="linux_arm" [ -n "$(echo $model | grep -E "linux.*mips.*")" ] && model="linux_mips" [ -n "$(echo $model | grep -E "linux.*x86_64.*")" ] && model="linux_x86_64" diff --git a/install_github.sh b/install_github.sh index 71c5772..00be79a 100644 --- a/install_github.sh +++ b/install_github.sh @@ -21,6 +21,7 @@ mburl="https://raw.githubusercontent.com/monlor/mbfiles/master" mbtmp="/tmp/mbtmp" [ ! -d "${mbtmp}" ] && mkdir -p ${mbtmp} model=$(uname -ms | tr ' ' '_' | tr '[A-Z]' '[a-z]') +[ -n "$(echo $model | grep -E "linux.*aarch64.*")" ] && model="linux_aarch64" [ -n "$(echo $model | grep -E "linux.*arm.*")" ] && model="linux_arm" [ -n "$(echo $model | grep -E "linux.*mips.*")" ] && model="linux_mips" [ -n "$(echo $model | grep -E "linux.*x86_64.*")" ] && model="linux_x86_64" diff --git a/update.sh b/update.sh index d2adbc7..e8cb26b 100644 --- a/update.sh +++ b/update.sh @@ -37,6 +37,7 @@ rm -rf ${mbroot}/bin/base64* if [ -z "$(mbdb get mixbox.main.model)" ]; then model=$(uname -ms | tr ' ' '_' | tr '[A-Z]' '[a-z]') + [ -n "$(echo $model | grep -E "linux.*aarch64.*")" ] && model="linux_aarch64" [ -n "$(echo $model | grep -E "linux.*arm.*")" ] && model="linux_arm" [ -n "$(echo $model | grep -E "linux.*mips.*")" ] && model="linux_mips" mbdb set mixbox.main.model="$model"