X-Git-Url: https://projects.mako.cc/source/muttjump/blobdiff_plain/fbad77933cca088c24bda6321f95cef5dd081617..3483ab946817418da01f60d6c59e45e34d46be50:/muttjump

diff --git a/muttjump b/muttjump
index 50ca34a..f7f6586 100755
--- a/muttjump
+++ b/muttjump
@@ -26,7 +26,7 @@ MUTTJUMP_MODE=${MUTTJUMP_MODE:-search}
 
 # "yes", "no" or "auto"
 # If set to "auto", the $STY environment variable is used for auto detection.
-MUTTJUMP_USE_SCREEN="auto"
+MUTTJUMP_USE_SCREEN=${MUTTJUMP_USE_SCREEN:-auto}
 
 # "yes" or "no"
 # If this is set to "yes", muttjump will not open a new instance of
@@ -40,7 +40,7 @@ MUTTJUMP_MULTI_SCREEN_MODE=${MUTTJUMP_MULTI_SCREEN_MODE:-no}
 MUTTJUMP_SCREEN_SESSION=${MUTTJUMP_SCREEN_SESSION:-}
 
 # function to create the screen window name from the full path of the mailbox
-if ! type -p MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE >/dev/null ; then
+if ! type MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE >/dev/null 2>&1 ; then
     function MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE () {
         basename "$1"
     }
@@ -65,7 +65,7 @@ function quote () {
 }
 
 function is_callable () {
-    type -p $1 >/dev/null
+    type $1 >/dev/null 2>&1
 }
 
 # Check command-line arguments and STDIN