use array=() instead of declare -a

[muttjump] / muttjump

diff --git a/muttjump b/muttjump
index 8170f4e821857f7d3f6c21c6d4af2af03421d84d..8486594fc07d03f9d219c1e8adf4c6f4c9c58ba6 100755 (executable)
--- a/muttjump
+++ b/muttjump
@@ -28,7 +28,9 @@ MUTTJUMP_MODE=${MUTTJUMP_MODE:-search}
 # If this is set to "yes", muttjump will not open a new instance of
 # mutt, but instead jump to the original message in a running mutt
 # (which is running in a screen session).
-MUTTJUMP_USE_SCREEN=${MUTTJUMP_USE_SCREEN:-no}
+# ATTENTION: You need to have one mutt instance open for every mailbox
+#            for this to work!
+MUTTJUMP_MULTI_SCREEN_MODE=${MUTTJUMP_MULTI_SCREEN_MODE:-no}
 
 # name of the screen session (screen -S ...), leave blank for none
 MUTTJUMP_SCREEN_SESSION=${MUTTJUMP_SCREEN_SESSION:-}
@@ -59,8 +61,7 @@ function quote () {
 }
 
 function is_callable () {
-    read cmd args <<<$1
-    type -p $cmd >/dev/null
+    type -p $1 >/dev/null
 }
 
 # Check command-line arguments and STDIN
@@ -140,7 +141,7 @@ fi
 
 jump_expr="~i'$msgid'"
 
-if [ "$MUTTJUMP_USE_SCREEN" = no ] ; then
+if [ "$MUTTJUMP_MULTI_SCREEN_MODE" = no ] ; then
 
     jump_cmd="<limit>$jump_expr<enter>"
     if [ "$MUTTJUMP_MODE" = search ] ; then
@@ -165,7 +166,7 @@ else
     fi
 
     screen_window_name=$(MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE "$orig_maildir")
-    declare -a screen_opts
+    screen_opts=()
     if [ -n "$MUTTJUMP_SCREEN_SESSION" ] ; then
         screen_opts=("-S" "$MUTTJUMP_SCREEN_SESSION")
         screen_opts_str="-S $(quote "$MUTTJUMP_SCREEN_SESSION")"