Add automount line if not there already, and replace if it is.

1 files changed, 5 insertions, 3 deletions

diff --git a/user-init b/user-init
index 714ed1b..18e5675 100755
--- a/user-init
+++ b/user-init
@@ -151,9 +151,11 @@ for user in $USERS; do
 
 	if [ "$do_server" = "yes" -a -r "$server_conf" -a -r $HOME/"$server_userconf" ]; then
 		server_username="$(grep '^username' $HOME/$server_userconf | awk -F= '{print $2}' | head -1 | awk '{print $1}')"
-#		grep -q "^volume $user smb $server_name $server_username " "$server_conf" || echo "volume $user smb $server_name $server_username $HOME/$server_root uid=$user,gid=$user - -" >> "$server_conf"
-		perl -pi -e "s|^volume $user .*|volume $user smb $server_name $server_username $HOME/$server_root uid=$user,gid=$user - -|" "$server_conf"
-		#TODO: Replace line using perl construct (currently a change of login adds a new line)
+		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
 exit 1
 	chown $user: $HOME