diff --git a/apps/vsftpd/config/mixbox.conf b/apps/vsftpd/config/mixbox.conf index 53658da..7531855 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/vsftpd.uci b/apps/vsftpd/config/vsftpd.uci index 7d02f6a..142db7c 100644 --- a/apps/vsftpd/config/vsftpd.uci +++ b/apps/vsftpd/config/vsftpd.uci @@ -5,4 +5,4 @@ supports="linux_arm,linux_mips,linux_x86_64" backupfiles="config/ftpuser.conf" appinfo="快速搭建Ftp服务器,局域网文件共享" newinfo="修复vsftpd脚本错误" -version="0.0.4" +version="0.0.5" diff --git a/apps/vsftpd/scripts/vsftpd.sh b/apps/vsftpd/scripts/vsftpd.sh index cffdb7a..d66fa22 100644 --- a/apps/vsftpd/scripts/vsftpd.sh +++ b/apps/vsftpd/scripts/vsftpd.sh @@ -6,12 +6,18 @@ 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 + add(){ sed -i "/$1/"d /etc/passwd sed -i "/$1/"d /etc/shadow @@ -88,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