mirror of
https://github.com/atmoz/sftp.git
synced 2024-11-17 12:51:33 -05:00
Merge branch 'tyranron-fix-return-statement-usage'
This commit is contained in:
commit
bd437a09cb
1 changed files with 6 additions and 6 deletions
|
@ -36,21 +36,21 @@ skipIndex=0
|
||||||
chpasswdOptions=""
|
chpasswdOptions=""
|
||||||
useraddOptions=(--no-user-group)
|
useraddOptions=(--no-user-group)
|
||||||
|
|
||||||
user="${args[0]}"; validateArg "username" "$user" "$reUser" || return 1
|
user="${args[0]}"; validateArg "username" "$user" "$reUser" || exit 1
|
||||||
pass="${args[1]}"; validateArg "password" "$pass" "$rePass" || return 1
|
pass="${args[1]}"; validateArg "password" "$pass" "$rePass" || exit 1
|
||||||
|
|
||||||
if [ "${args[2]}" == "e" ]; then
|
if [ "${args[2]}" == "e" ]; then
|
||||||
chpasswdOptions="-e"
|
chpasswdOptions="-e"
|
||||||
skipIndex=1
|
skipIndex=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
uid="${args[$((skipIndex+2))]}"; validateArg "UID" "$uid" "$reUid" || return 1
|
uid="${args[$((skipIndex+2))]}"; validateArg "UID" "$uid" "$reUid" || exit 1
|
||||||
gid="${args[$((skipIndex+3))]}"; validateArg "GID" "$gid" "$reGid" || return 1
|
gid="${args[$((skipIndex+3))]}"; validateArg "GID" "$gid" "$reGid" || exit 1
|
||||||
dir="${args[$((skipIndex+4))]}"; validateArg "dirs" "$dir" "$reDir" || return 1
|
dir="${args[$((skipIndex+4))]}"; validateArg "dirs" "$dir" "$reDir" || exit 1
|
||||||
|
|
||||||
if getent passwd "$user" > /dev/null; then
|
if getent passwd "$user" > /dev/null; then
|
||||||
log "WARNING: User \"$user\" already exists. Skipping."
|
log "WARNING: User \"$user\" already exists. Skipping."
|
||||||
return 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "$uid" ]; then
|
if [ -n "$uid" ]; then
|
||||||
|
|
Loading…
Reference in a new issue