summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xuser-init10
1 files changed, 6 insertions, 4 deletions
diff --git a/user-init b/user-init
index 6536e01..6a7218e 100755
--- a/user-init
+++ b/user-init
@@ -140,10 +140,12 @@ for user in $USERS; do
if [ "$do_server" = "yes" -a -r "$server_conf" -a -f $HOME/"$server_userconf" ]; then
server_username="$(grep '^username' $HOME/$server_userconf | awk -F= '{print $2}' | head -1 | awk '{print $1}')"
- if grep -q "^volume $user " "$server_conf"; then
- perl -pi -e "s|^volume $user .*|volume $user smb $server_name $server_username $HOME/$server_root uid=$user,gid=$user - -|" "$server_conf"
- else
- echo "volume $user smb $server_name $server_username $HOME/$server_root uid=$user,gid=$user - -" >> "$server_conf"
+ if [ -n "$server_username" ]; then
+ if grep -q "^volume $user " "$server_conf"; then
+ perl -pi -e "s|^volume $user .*|volume $user smb $server_name $server_username $HOME/$server_root uid=$user,gid=$user - -|" "$server_conf"
+ else
+ echo "volume $user smb $server_name $server_username $HOME/$server_root uid=$user,gid=$user - -" >> "$server_conf"
+ fi
fi
fi