Fix accidentally exiting the user's shell on boot

TLATER · May 13, 2017 · 34e9094 · 34e9094
1 parent eb40bd3
commit 34e9094
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/dialog.sh.in b/src/dialog.sh.in
@@ -23,7 +23,7 @@ get_session_with_dialog() (
     dialog --title "blm" --menu "$PS3" "$HEIGHT" "$WIDTH" "$ITEMHEIGHT" $session_nums 2>/tmp/blm
 
     if [ $? -eq 1 ]; then
-        exit
+        return
     fi
 
     reply=$(( $(cat "/tmp/blm") - 1))

diff --git a/src/init.sh.in b/src/init.sh.in
@@ -5,14 +5,14 @@
 check_env() {
     # Don't re-launch blm in this session.
     if [ ! -z "${NOLM+x}" ]; then
-        exit 1
+        exec "$SHELL"
     fi
 
     export NOLM=true
 
     # Ensure that we are in a login shell.
     if [[ ! $(tty) == "/dev/tty"[0-9]* ]]; then
-        exit 1
+        exec "$SHELL"
     fi
 }
 

diff --git a/src/main.sh.in b/src/main.sh.in
@@ -2,7 +2,7 @@
 
 error() {
     echo "$1" >2
-    exit 1
+    exec "$SHELL"
 }
 
 # Get the current tty and an available display
@@ -42,7 +42,7 @@ fi
 
 session=$(cat "/tmp/blm")
 if [ ! -f "$session" ]; then
-    exit
+    exec "$SHELL"
 fi
 
 if [[ "$session" == "$XSESSIONS"* ]]; then