更新koolproxy二进制至最新版

.github/workflows/main.yml

@@ -7,13 +7,6 @@ on:
       - master
       - test
       - dev
-    tags-ignore:
-      - deploy-*
-      - test-*
-      - master-*
-    ignore-paths:
-      - '.github'
-      - 'README.md'
   pull_request:
     branchs:  
       - master

README.md

@@ -12,6 +12,10 @@
 
 ### 更新日志
 
+* 2020-03-06
+	* 更新frps到0.31.2
+	* 修复工具箱下载插件失败的问题
+
 * 2020-03-05-2
 	* 由于cdn缓存不刷新，还是滚回了`coding`源：`https://monlor.coding.net/p/mbfiles/d/mbfiles/git/raw/master`
 	* 新增`DLNA`插件`DMS`
@@ -135,7 +139,7 @@ mixbox help
 	|    |--- /data/        --- 硬盘目录
 	|--- /extdisks/
 	|    |--- /sd*/         --- 外接盘目录
-	
+
 
 ### 插件列表
 
@@ -191,5 +195,11 @@ mixbox help
 * `gitsync.sh`是打包插件的脚本，-v为更新版本号`可无`，打包的插件生成在appstore下
 	
 
+#### 请喝咖啡
+
+|                             微信                             |                            支付宝                            |
+| :----------------------------------------------------------: | :----------------------------------------------------------: |
+| ![](https://cdn.jsdelivr.net/gh/monlor/file/img/20200312145215.png) | ![](https://cdn.jsdelivr.net/gh/monlor/file/img/20200312145148.png) |
+
 
 

apps/dms/scripts/config.sh

@@ -1,4 +1,5 @@
 #!/bin/sh
+#copyright by monlor
 
 eval `mbdb export dms`
 source "$(mbdb get mixbox.main.path)"/bin/base
@@ -11,7 +12,7 @@ if [ "$enable" == '1' ]; then
     readsh "请输入${appname}媒体服务器名称" "servername" "mixbox-dms"
     # readsh "请输入${appname}外网访问配置[1/0]" "openport" "0"
     readsh "重启${appname}服务[1/0] " "res" "1"
-    [ "$res" = '1' -o -z "$res" ] && return 1
+    [ "$res" = '1' -o -z "$res" ] && return 0
 else
-    return 0
+    return 1
 fi

apps/frps/config/frps.uci

@@ -4,5 +4,5 @@ needver="0.0.1"
 openport="1"
 supports="linux_arm,linux_mips,linux_x86_64,darwin_x86_64"
 appinfo="内网穿透工具Frp服务端"
-newinfo="frp程序更新到0.21.0"
-version="1.1.2"
+newinfo="frp程序更新到0.31.2"
+version="1.1.4"

apps/frps/config/mixbox.conf

@@ -1,39 +0,0 @@
-#------------------【Frps】--------------------
-frps() {
-
-        eval `mbdb export frps`
-        source /etc/mixbox/bin/base
-        uciset="mbdb set $appname.main"
-        echo "********* $service ***********"
-        echo "[${appinfo}]"
-		echo "技巧：回车表示默认或历史设置，-1表示还原默认或不启用"
-        readsh "启动${appname}服务[1/0] " "enable" "1"
-        
-        if [ "$enable" == '1' ]; then
-                # Scripts Here
-				read -p "修改${appname}配置信息？[1/0] " res
-				if [ "$res" = '1' ]; then
-					readsh "请输入${appname}运行端口号" "port" "7000"
-					readsh "请输入${appname}的udp端口号" "udp_port" "7001"
-					readsh "请输入${appname}的kcp配置[1/0]" "kcp" "1"
-					readsh "请输入${appname}用于http穿透的端口号" "http_port" "90"
-					readsh "请输入${appname}用于https穿透的端口号" "https_port" "91"
-					readsh "请输入${appname}访问密钥" "token" "12345678"
-					readsh "请输入${appname}子域名" "subdomain" 
-					read -p "是否启用${appname}的web控制面板？[1/0] " res
-					[ -n "$res" ] && mbdb set $appname.main.dashboard="$res"
-					if [ "$res" = '1' ]; then
-						readsh "请输入${appname}控制面板端口号" "dashboard_port" "7500"
-						readsh "请输入${appname}控制面板用户名" "dashboard_user" "admin"
-						readsh "请输入${appname}控制面板密码" "dashboard_pwd" "admin"
-					fi
-				fi
-				readsh "请输入${appname}外网访问配置[1/0]" "openport" "1"
-
-                ${mbroot}/apps/${appname}/scripts/${appname}.sh restart
-        else
-                ${mbroot}/apps/${appname}/scripts/${appname}.sh stop
-        fi
-
-}
-#------------------【Frps】--------------------

apps/frps/config/version.txt

@@ -1 +0,0 @@
-1.0.4

apps/frps/scripts/config.sh

@@ -0,0 +1,35 @@
+#!/bin/sh
+#copyright by monlor
+
+eval `mbdb export frps`
+source /etc/mixbox/bin/base
+uciset="mbdb set $appname.main"
+echo "********* $service ***********"
+echo "[${appinfo}]"
+echo "技巧：回车表示默认或历史设置，-1表示还原默认或不启用"
+readsh "启动${appname}服务[1/0] " "enable" "1"
+
+if [ "$enable" == '1' ]; then
+  # Scripts Here
+	read -p "修改${appname}配置信息？[1/0] " res
+	if [ "$res" = '1' ]; then
+		readsh "请输入${appname}运行端口号" "port" "7000"
+		readsh "请输入${appname}的udp端口号" "udp_port" "7001"
+		readsh "请输入${appname}的kcp配置[1/0]" "kcp" "1"
+		readsh "请输入${appname}用于http穿透的端口号" "http_port" "90"
+		readsh "请输入${appname}用于https穿透的端口号" "https_port" "91"
+		readsh "请输入${appname}访问密钥" "token" "12345678"
+		readsh "请输入${appname}子域名" "subdomain" 
+		read -p "是否启用${appname}的web控制面板？[1/0] " res
+		[ -n "$res" ] && mbdb set $appname.main.dashboard="$res"
+		if [ "$res" = '1' ]; then
+			readsh "请输入${appname}控制面板端口号" "dashboard_port" "7500"
+			readsh "请输入${appname}控制面板用户名" "dashboard_user" "admin"
+			readsh "请输入${appname}控制面板密码" "dashboard_pwd" "admin"
+		fi
+	fi
+	readsh "请输入${appname}外网访问配置[1/0]" "openport" "1"
+	return 0
+else
+  return 1
+fi

apps/frps/scripts/frps.sh

@@ -1,4 +1,5 @@
 #!/bin/sh 
+#copyright by monlor
 source /etc/mixbox/bin/base
 eval `mbdb export frps`
 

apps/koolproxy/config/koolproxy.uci

@@ -10,4 +10,4 @@ kp_rule_koolproxy="https://houzi-.coding.net/p/my_dream/d/my_dream/git/raw/maste
 kp_rule_daily="https://houzi-.coding.net/p/my_dream/d/my_dream/git/raw/master/daily.txt"
 kp_rule_dat="https://houzi-.coding.net/p/my_dream/d/my_dream/git/raw/master/kp.dat"
 kp_rule_user="https://raw.githubusercontent.com/kysdm/ad-rules/master/user-rules-koolproxy.txt"
-version="1.5.5"
+version="1.5.6"

apps/mixbox/bin/mixbox

@@ -336,8 +336,8 @@ select_app() {
 						[ "$update" == '1' ] && ${mbroot}/scripts/appmanage.sh upgrade ${appname} 
 					fi
 					# todo 配置方式修改
-					if [ -f ${mbroot}/apps/${appname}/config.sh ]; then
-						${mbroot}/apps/${appname}/config.sh
+					if [ -f ${mbroot}/apps/${appname}/scripts/config.sh ]; then
+						${mbroot}/apps/${appname}/scripts/config.sh
 						if [ $? -eq 0 ]; then
 							${mbroot}/apps/${appname}/scripts/${appname}.sh restart
 						else

apps/mixbox/config/mixbox.uci

@@ -3,5 +3,5 @@ appname="mixbox"
 needver=""
 supports="linux_arm,linux_mips,linux_x86_64"
 appinfo="一款支持多平台，多架构的Shell工具箱"
-newinfo="新增base64_encode工具"
-version="0.1.9.2"
+newinfo="修复mixbox命令错误"
+version="0.1.9.6"

apps/mixbox/scripts/helper.sh

@@ -13,10 +13,10 @@ wgetsh() {
 		result1=$(curl -skL --connect-timeout 10 -m 20 -w %{http_code} -o "${mbtmp}/${wgetfilename}" "$wgeturl")
 	else
 		wget-ssl -q --no-check-certificate --tries=1 --timeout=10 -O "${mbtmp}/${wgetfilename}" "$wgeturl"
-		[ $? -eq 0 ] && result="200"
+		[ $? -eq 0 ] && result1="200"
 	fi
 	[ -f "${mbtmp}/${wgetfilename}" ] && result2=$(du -sh "${mbtmp}/${wgetfilename}" 2> /dev/null | awk '{print$1}')
-	if [ "$result" = "200" ] && [ "$result2" != '0' ]; then
+	if [ "$result1" = "200" ] && [ "$result2" != '0' ]; then
 		chmod +x ${mbtmp}/${wgetfilename} > /dev/null 2>&1
 		mv -f ${mbtmp}/${wgetfilename} $wgetfilepath > /dev/null 2>&1
 		return 0
@@ -40,11 +40,7 @@ base_encode() {
 	if [ -z "${1}" ]; then
 		echo -n "" 
 	else
-		if base64-encode &> /dev/null; then
-			echo -n "$*" | base64-encode
-		else
-			echo -n "$*" | baseutil --b64
-		fi
+		echo -n "$*" | base64
 	fi
 }
 
@@ -52,11 +48,7 @@ base_decode() {
 	if [ -z "${1}" ]; then
 		echo -n "" 
 	else
-		if base64-decode &> /dev/null; then
-			echo -n "$*" | base64-decode
-		else
-			echo -n "$*" | baseutil --b64 -d
-		fi
+		echo -n "$*" | base64 -d
 	fi
 }
 
@@ -67,7 +59,7 @@ versioncmp() {
 
 	[ "$1" = "$2" ] && echo -n "0" && return
 
-	if test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; then
+	if test "$(echo "$@" | tr " " "\n" | sort | head -n 1)" != "$1"; then
 		echo -n "-1"
 	else 
 		echo -n "1"

apps/ngrok/scripts/ngrok.sh

@@ -1,4 +1,5 @@
 #!/bin/sh 
+#copyright by monlor
 source /etc/mixbox/bin/base
 eval `mbdb export ngrok`
 

apps/npc/config/mixbox.conf

@@ -1,21 +0,0 @@
-#------------------【NPC】--------------------
-npc() {
-
-  eval `mbdb export npc`
-  source "$(mbdb get mixbox.main.path)"/bin/base
-  echo "********* $service ***********"
-  echo "[${appinfo}]"
-  readsh "启动${appname}服务[1/0] " "enable" "1"
-  if [ "$enable" == '1' ]; then
-      # Scripts Here
-      readsh "请输入npc连接命令：" "connect_cmd" 
-
-      # readsh "请输入${appname}外网访问配置[1/0]" "openport" "0"
-      readsh "重启${appname}服务[1/0] " "res" "1"
-      [ "$res" = '1' -o -z "$res" ] && ${mbroot}/apps/${appname}/scripts/${appname}.sh restart
-  else
-      ${mbroot}/apps/${appname}/scripts/${appname}.sh stop
-  fi
-
-}
-#------------------【NPC】--------------------

apps/npc/config/npc.uci

@@ -5,4 +5,4 @@ backupfiles=""
 supports="linux_arm,linux_mips,linux_x86_64"
 appinfo="一款轻量级、高性能、功能强大的内网穿透代理服务器"
 newinfo=""
-version="0.0.7"
+version="0.0.9"

apps/npc/scripts/config.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+#copyright by monlor
+
+eval `mbdb export npc`
+source "$(mbdb get mixbox.main.path)"/bin/base
+echo "********* $service ***********"
+echo "[${appinfo}]"
+readsh "启动${appname}服务[1/0] " "enable" "1"
+if [ "$enable" == '1' ]; then
+    # Scripts Here
+    readsh "请输入npc连接命令：" "connect_cmd" 
+
+    # readsh "请输入${appname}外网访问配置[1/0]" "openport" "0"
+    readsh "重启${appname}服务[1/0] " "res" "1"
+    [ "$res" = '1' -o -z "$res" ] && return 0
+else
+    return 1
+fi

apps/vsftpd/config/version.txt

@@ -1 +0,0 @@
-1.1.6

apps/vsftpd/config/vsftpd.uci

@@ -4,5 +4,5 @@ needver="0.0.1"
 supports="linux_arm,linux_mips,linux_x86_64"
 backupfiles="config/ftpuser.conf"
 appinfo="快速搭建Ftp服务器，局域网文件共享"
-newinfo=""
-version="0.0.3"
+newinfo="修复vsftpd状态显示bug"
+version="0.0.6"

apps/vsftpd/scripts/vsftpd.sh

@@ -6,12 +6,17 @@ port=21
 FTPUSER=${mbroot}/apps/vsftpd/config/ftpuser.conf
 # binname="${appname} ${appname}-ext"
 userpath=/etc/mixbox/apps/vsftpd/config/vsftpd.users
-[ "$entware" = '1' ] && configpath=/opt/etc/vsftpd/vsftpd.conf || configpath=/etc/vsftpd.conf
+configpath=/etc/vsftpd.conf
+BINPATH=${mbroot}/apps/${appname}/bin/${appname} 
 
+if [ "$entware" = '1' ]; then
+	configpath=/opt/etc/vsftpd/vsftpd.conf
+	BINPATH=/opt/sbin/vsftpd
+fi
 [ ! -d /var/run/vsftpd ] && mkdir -p /var/run/vsftpd
 [ -z "$port" ] && port=21
 [ -z "$anon_root" ] && anon_root=/var/ftp 
-[ ! -f "${configpath}" ] && touch ${configpath}
+
 
 add(){
 	sed -i "/$1/"d /etc/passwd
@@ -74,7 +79,7 @@ set_config() {
 		anon_enable=NO
 	fi
 	
-	mount --bind ${mbroot}/apps/${appname}/config/${appname}.conf ${configpath}
+	cp -rf ${mbroot}/apps/${appname}/config/${appname}.conf ${configpath}
 	echo -e "anonymous_enable=$anon_enable\nanon_root=$anon_root\nlisten_port=${port}" >> ${configpath}
 
 }
@@ -89,20 +94,19 @@ start () {
 	logsh "【$service】" "正在启动${appname}服务... "
 	if [ ! -f ${mbroot}/apps/${appname}/bin/${appname} ]; then
 		bincheck ${binname} 
-    	if [ $? -eq 0 ]; then
-    		logsh "【$service】" "安装程序成功，链接程序到工具箱..."
-    		ln -sf $(which $binname) ${mbroot}/apps/${appname}/bin/${appname} 
-    	else
-    		logsh "【$service】" "程序安装失败！"
-    		end
-    	fi
+  	if [ $? -eq 0 ]; then
+  		logsh "【$service】" "安装程序成功，链接程序到工具箱..."
+  	else
+  		logsh "【$service】" "程序安装失败！"
+  		end
+  	fi
 	fi
 	# init_mount
 	set_config
 	
 	open_port
-    write_firewall_start
-	daemon ${mbroot}/apps/${appname}/bin/${appname} 
+   write_firewall_start
+	daemon $BINPATH
 	if [ $? -ne 0 ]; then
             logsh "【$service】" "启动${appname}服务失败！"
     else
@@ -121,8 +125,9 @@ stop () {
 	do
 		[ ! -z "${line}" ] && del ${line}
 	done
-	rm -rf ${configpath}
 	killall -9 ${appname} &> /dev/null
+	rm -rf ${configpath}
+	
 	
 
 }
@@ -130,8 +135,7 @@ stop () {
 
 status() {
 
-	result=$(pssh | grep ${mbroot}/apps/${appname}/bin/${appname} | grep -v grep | wc -l)
-	if [ "$result" == '0' ]; then
+  if [ -n "$(pidof "${BINPATH}")" ]; then
 		status="未运行|0"
 	else
 		status="运行端口号: ${port}|1"

appsbin/v2ray-bin/linux_arm/lastest.txt

@@ -1 +1 @@
-4.9.0
+4.22.1

install.sh

@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #copyright by monlor
-  
+   
 clear
 logsh() {
 	# 输出信息到/tmp/messages和标准输出

tools/gitsync.sh

@@ -76,12 +76,9 @@ pack() {
 	done
 	gerneral_applist
 
-	if [ ! -d ${pack_dir} ]; then
-		mkdir -p ${pack_dir}
-		mkdir -p ${pack_dir}/appstore
-		mkdir -p ${pack_dir}/temp
-		mkdir -p ${pack_dir}/appsbin
-	fi
+	test ! -d ${pack_dir}/appstore && mkdir -p ${pack_dir}/appstore
+	test ! -d ${pack_dir}/temp && mkdir -p ${pack_dir}/temp
+	test ! -d ${pack_dir}/appsbin && mkdir -p ${pack_dir}/appsbin
 	
 	cp -rf appsbin/* ${pack_dir}/appsbin/
   cp -rf temp/* ${pack_dir}/temp/
@@ -137,7 +134,7 @@ deploy() {
 	  git add .
 	  git commit -m "$(TZ='Asia/Shanghai' date "+%Y-%m-%d %H:%M:%S")" -a
 	fi
-	# git lfs push "$3" --all
+	git lfs push "$3" --all
   git push "$3"
 }