@@ -18,7 +18,7 @@ anon_container_name="anon_ftp_server"
18
18
default_anon_root=" $HOME "
19
19
user_container_name=" user_ftp_server"
20
20
startUID=10000
21
- mnt_poin=" /ftp/ "
21
+ mnt_poin=" /ftp"
22
22
fdeleted_uid=" $DOCKSRC /$user_container_name /deleted.uid"
23
23
fcurrent_uid=" $DOCKSRC /$user_container_name /current.uid"
24
24
tmp_ifs=" $IFS "
@@ -65,7 +65,6 @@ delete_server() {
65
65
}
66
66
67
67
power () {
68
- set -x
69
68
loading
70
69
case " $2 " in
71
70
on)
@@ -109,9 +108,9 @@ add_user() {
109
108
--title " Add User" \
110
109
--mixedform " Root directory must be absolute" 0 0 2 \
111
110
" uid(UserID) username: password: root directory:" 1 1 " " 1 37 0 0 2 \
112
- " uid($uid )" 1 1 " " 1 13 16 0 0 \
113
- " " 1 1 " " 1 30 16 0 0 \
114
- " " 1 1 " " 1 47 25 0 0 ) "
111
+ " uid($uid )" 2 1 " " 2 13 16 0 0 \
112
+ " " 2 1 " " 2 30 16 0 0 \
113
+ " " 2 1 " " 2 47 50 0 0 ) "
115
114
set -- $output
116
115
username=" $1 "
117
116
password=" $2 "
@@ -120,8 +119,13 @@ add_user() {
120
119
msg " This username already exists"
121
120
return
122
121
fi
123
- str=" $username |$password |$rootdir |$uid "
124
- sed " s:$users :$users$str :" < $file > " $file .$$ " && mv " $file .$$ " $file
122
+ str=" $username |$password |$mnt_poin /$rootdir |$uid "
123
+ if [ -z " $users " ]; then
124
+ sed " s: - USERS=: - USERS=$str :" < $file > " $file .$$ " && mv " $file .$$ " $file
125
+ else
126
+ sed " s:$users :$users$str :" < $file > " $file .$$ " && mv " $file .$$ " $file
127
+ fi
128
+ echo " - $rootdir :$mnt_poin /$rootdir " >> " $file "
125
129
126
130
if [ $getfromdeleted -eq 1 ]; then
127
131
tail -n +2 " $fdeleted_uid " > " $fdeleted_uid .$$ " && mv " $fdeleted_uid .$$ " " $fdeleted_uid "
@@ -144,7 +148,6 @@ delete_user() {
144
148
}
145
149
146
150
user_management () {
147
- file=" $DOCKSRC /$user_container_name /docker-compose.yml"
148
151
while : ; do
149
152
users=" $( grep -oP " USERS=\K.*" $file ) "
150
153
if [ -z " $users " ]; then
@@ -172,8 +175,9 @@ user_management() {
172
175
done
173
176
}
174
177
175
- # set -x
178
+ set -x
176
179
180
+ file=" $DOCKSRC /$user_container_name /docker-compose.yml"
177
181
if [ -z " $( ls -A $DOCKSRC ) " ]; then
178
182
if ! dialog --backtitle " $backtitle " --title " No server found!" --yesno " You don't have server\nDo you want to create?" 0 0; then
179
183
exit 0
@@ -224,7 +228,7 @@ while :; do
224
228
power " $anon_container_name " " on"
225
229
;;
226
230
2)
227
- if ! grep -qoP " USERS=\K.*" $file ; then
231
+ if [ -z " $( grep -oP " USERS=\K.*" $file ) " ] ; then
228
232
msg " No user found on server. You must add at least one user to turn on server in User-mod"
229
233
add_user
230
234
fi
0 commit comments