set passwd/user-uid
EOF
-if ! grep "${USERNAME}" /root/etc/passwd
+if ! grep -qs "${USERNAME}" /root/etc/passwd
then
echo "The default user (${USERNAME}) is not present,"
first_user=$(grep '^[^:]*:[^:]*:[12]\?[0-9][0-9][0-9][0-9]:' /root/etc/passwd | head -1 | cut -f1 -d ':')
mv /root/home/${USERNAME}/Examples /root/home/${USERNAME}/Desktop/
fi
+if [ -f /root/home/$USERNAME/examples.desktop ]; then
+ chroot /root install -o $USERNAME -g $USERNAME -d /home/$USERNAME/Desktop/
+ mv /root/home/$USERNAME/examples.desktop /root/home/$USERNAME/Desktop/
+fi
+
+if [ -e /root/usr/share/applications/live-installer-launcher.desktop ]
+then
+ chroot /root install -D -o ${USERNAME} -g ${USERNAME} /usr/share/applications/live-installer-launcher.desktop /home/${USERNAME}/Desktop/live-installer-launcher.desktop
+fi
+
log_end_msg