Merge pull request #162 from fredliang44/master

feat: add AX3600 support (not completed yet)

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}服务完成！"
     
 

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 $?
 }
 

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"

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"

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

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"

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"

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"

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"