From f61eb3528dade0d28c47214d2799992878cc09a1 Mon Sep 17 00:00:00 2001
From: monlor <monlor@qq.com>
Date: Sat, 7 Mar 2020 13:17:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dvsftpd=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/vsftpd/config/mixbox.conf | 8 ++++----
 apps/vsftpd/config/version.txt | 1 -
 apps/vsftpd/config/vsftpd.uci  | 4 ++--
 apps/vsftpd/scripts/vsftpd.sh  | 6 +++---
 4 files changed, 9 insertions(+), 10 deletions(-)
 delete mode 100644 apps/vsftpd/config/version.txt

diff --git a/apps/vsftpd/config/mixbox.conf b/apps/vsftpd/config/mixbox.conf
index 7531855..53658da 100644
--- a/apps/vsftpd/config/mixbox.conf
+++ b/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
diff --git a/apps/vsftpd/config/version.txt b/apps/vsftpd/config/version.txt
deleted file mode 100644
index 0664a8f..0000000
--- a/apps/vsftpd/config/version.txt
+++ /dev/null
@@ -1 +0,0 @@
-1.1.6
diff --git a/apps/vsftpd/config/vsftpd.uci b/apps/vsftpd/config/vsftpd.uci
index 3507c05..7d02f6a 100644
--- a/apps/vsftpd/config/vsftpd.uci
+++ b/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脚本错误"
+version="0.0.4"
diff --git a/apps/vsftpd/scripts/vsftpd.sh b/apps/vsftpd/scripts/vsftpd.sh
index bebeaaa..cffdb7a 100644
--- a/apps/vsftpd/scripts/vsftpd.sh
+++ b/apps/vsftpd/scripts/vsftpd.sh
@@ -11,7 +11,6 @@ userpath=/etc/mixbox/apps/vsftpd/config/vsftpd.users
 [ ! -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 +73,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}
 
 }
@@ -121,8 +120,9 @@ stop () {
 	do
 		[ ! -z "${line}" ] && del ${line}
 	done
-	rm -rf ${configpath}
 	killall -9 ${appname} &> /dev/null
+	rm -rf ${configpath}
+	
 	
 
 }