Adding upstream version 1.107.1.

[live-boot-grml.git] / scripts / live-bottom / 10adduser

diff --git a/scripts/live-bottom/10adduser b/scripts/live-bottom/10adduser
index 4c83fa3..d76f143 100755 (executable)
--- a/scripts/live-bottom/10adduser
+++ b/scripts/live-bottom/10adduser
@@ -33,7 +33,7 @@ log_begin_msg "Adding live session user..."
 
 if [ "${BUILD_SYSTEM}" = "Debian" ]
 then
-       user_crypted="8Ab05sVQ4LLps" # as in `echo "live" | mkpasswd -s`
+       user_crypted="8Ab05sVQ4LLps" # as in $(echo "live" | mkpasswd -s)
 else
        user_crypted="U6aMy0wojraho" # "ubuntu"
 fi
@@ -43,8 +43,8 @@ chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<
 set passwd/make-user true
 set passwd/root-password-crypted *
 set passwd/user-password-crypted ${user_crypted}
-set passwd/user-fullname $USERFULLNAME
-set passwd/username $USERNAME
+set passwd/user-fullname ${USERFULLNAME}
+set passwd/username ${USERNAME}
 set passwd/user-uid 999
 EOF
 
@@ -80,9 +80,9 @@ then
 
                        for file in /usr/share/applications/ubiquity-gtkui.desktop /usr/share/applications/kde/ubiquity-kdeui.desktop
                        do
-                               if [ -f "/root/$file" ]
+                               if [ -f "/root/${file}" ]
                                then
-                                       chroot /root install -D -o $USERNAME -g $USERNAME $file /home/$USERNAME/Desktop/$(basename "$file")
+                                       chroot /root install -D -o ${USERNAME} -g ${USERNAME} ${file} /home/${USERNAME}/Desktop/$(basename "${file}")
                                        break
                                fi
                        done
@@ -112,15 +112,15 @@ EOF
        fi
 fi
 
-if [ -L /root/home/$USERNAME/Examples ]
+if [ -L /root/home/${USERNAME}/Examples ]
 then
-       chroot /root install -o $USERNAME -g $USERNAME -d /home/$USERNAME/Desktop/
-       mv /root/home/$USERNAME/Examples /root/home/$USERNAME/Desktop/
+       chroot /root install -o ${USERNAME} -g ${USERNAME} -d /home/${USERNAME}/Desktop/
+       mv /root/home/${USERNAME}/Examples /root/home/${USERNAME}/Desktop/
 fi
 
 if [ -f "/root/usr/share/apps/khelpcenter/plugins/kubuntu/about-kubuntu.desktop.tobemoved" ]
 then
-       chroot /root install -D -o $USERNAME -g $USERNAME /usr/share/apps/khelpcenter/plugins/kubuntu/about-kubuntu.desktop.tobemoved /home/$USERNAME/Desktop/about-kubuntu.desktop
+       chroot /root install -D -o ${USERNAME} -g ${USERNAME} /usr/share/apps/khelpcenter/plugins/kubuntu/about-kubuntu.desktop.tobemoved /home/${USERNAME}/Desktop/about-kubuntu.desktop
 fi
 
 log_end_msg