Hard code for /bin/bash to avoid issues with TCSH users

become_user

@@ -10,7 +10,8 @@ fi
 # Find our display number
 if [ -z "${DISPLAY}" ]; then
   echo "DISPLAY not set - X11 will not be configured in the new user"
-  sudo -H -i -u $1 
+  sudo -H -u $1 SHELL=/bin/bash /bin/bash -l
+  exit 0
 fi
 d=`echo $DISPLAY| cut -d: -f2`
 hn=`hostname --fqdn`

become_x11

@@ -2,4 +2,5 @@
 
 # Script to inherit X11 session from use we came from
 /usr/bin/xauth add ${SUDO_XAUTH}
-exec ${SHELL} -l
+export SHELL=/bin/bash
+exec /bin/bash -l