Merge lp:~sschapiro/lightdm/guest-account-scripts-bash-support-1_12 into lp:lightdm/1.12

[Schlomo Schapiro]

Fixes #1411100

[Gunnar Hjalmarsson (gunnarhj)]

Identical with the change proposed at https://code.launchpad.net/~sschapiro/lightdm/guest-account-scripts-bash-support/+merge/246823

review: Approve

[Robert Ancell (robert-ancell)]

Thanks Schlomo, I've also merged this into the 1.10 branch.

[Robert Ancell (robert-ancell)]

review: Approve

=== modified file 'debian/guest-account.sh'
--- debian/guest-account.sh	2014-07-25 22:12:59 +0000
+++ debian/guest-account.sh	2015-01-17 18:30:51 +0000
@@ -119,46 +119,46 @@
 
 remove_account ()
 {
-  USER=$1
+  GUEST_USER=$1
   
-  PWENT=`getent passwd "$USER"` || {
-    echo "Error: invalid user $USER"
+  PWENT=`getent passwd "$GUEST_USER"` || {
+    echo "Error: invalid user $GUEST_USER"
     exit 1
   }
-  UID=`echo "$PWENT" | cut -f3 -d:`
-  HOME=`echo "$PWENT" | cut -f6 -d:`
+  GUEST_UID=`echo "$PWENT" | cut -f3 -d:`
+  GUEST_HOME=`echo "$PWENT" | cut -f6 -d:`
 
-  if [ "$UID" -ge 500 ]; then
-    echo "Error: user $USER is not a system user."
+  if [ "$GUEST_UID" -ge 500 ]; then
+    echo "Error: user $GUEST_USER is not a system user."
     exit 1
   fi
 
-  if [ "${HOME}" = "${HOME#/tmp/}" ]; then
-    echo "Error: home directory $HOME is not in /tmp/."
+  if [ "${GUEST_HOME}" = "${GUEST_HOME#/tmp/}" ]; then
+    echo "Error: home directory $GUEST_HOME is not in /tmp/."
     exit 1
   fi
 
   # kill all remaining processes
-  while ps h -u "$USER" >/dev/null; do 
-    killall -9 -u "$USER" || true
+  while ps h -u "$GUEST_USER" >/dev/null; do 
+    killall -9 -u "$GUEST_USER" || true
     sleep 0.2; 
   done
 
-  umount "$HOME" || umount -l "$HOME" || true
-  rm -rf "$HOME"
+  umount "$GUEST_HOME" || umount -l "$GUEST_HOME" || true
+  rm -rf "$GUEST_HOME"
 
   # remove leftovers in /tmp
-  find /tmp -mindepth 1 -maxdepth 1 -uid "$UID" -print0 | xargs -0 rm -rf || true
+  find /tmp -mindepth 1 -maxdepth 1 -uid "$GUEST_UID" -print0 | xargs -0 rm -rf || true
 
   # remove possible /media/guest-XXXXXX folder
-  if [ -d /media/"$USER" ]; then
-    for dir in $( find /media/"$USER" -mindepth 1 -maxdepth 1 ); do
+  if [ -d /media/"$GUEST_USER" ]; then
+    for dir in $( find /media/"$GUEST_USER" -mindepth 1 -maxdepth 1 ); do
       umount "$dir" || true
     done
-    rmdir /media/"$USER" || true
+    rmdir /media/"$GUEST_USER" || true
   fi
 
-  deluser --system "$USER"
+  deluser --system "$GUEST_USER"
 }
 
 case "$1" in