2019-01-04

apps/vsftpd/config/mixbox.conf

@@ -53,10 +53,10 @@ vsftpd() {
 		[ "$res" == '1' ] && vsftpdAdd
 		read -p "删除${appname}用户？[1/0] " res
 		[ "$res" == '1' ] && vsftpdDel
-		if [ "$(mbdb get entware.main.enable)" = '1' ]; then
-			readsh "使用entware安装插件程序[1/0]" "entware" "1"
-			[ "$entware" = '1' ] && mv ${mbroot}/apps/${appname}/bin/${appname} ${mbroot}/apps/${appname}/bin/${appname}.bak &> /dev/null
-		fi
+		# if [ "$(mbdb get entware.main.enable)" = '1' ]; then
+		# 	readsh "使用entware安装插件程序[1/0]" "entware" "1"
+		# 	[ "$entware" = '1' ] && mv ${mbroot}/apps/${appname}/bin/${appname} ${mbroot}/apps/${appname}/bin/${appname}.bak &> /dev/null
+		# fi
 		readsh "请输入${appname}外网访问配置[1/0]" "openport" "1"
 		
 		${mbroot}/apps/${appname}/scripts/${appname}.sh restart

apps/vsftpd/scripts/vsftpd.sh

@@ -4,7 +4,7 @@ eval `mbdb export vsftpd`
 
 port=21
 FTPUSER=${mbroot}/apps/vsftpd/config/ftpuser.conf
-binname="${appname} ${appname}-ext"
+# binname="${appname} ${appname}-ext"
 
 add(){
 	sed -i "/$1/"d /etc/passwd
@@ -82,16 +82,16 @@ start () {
 		exit 1
 	fi
 	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
-	fi
+	# 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
+	# fi
 	# init_mount
 	set_config
 	

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]')