fix quoting issues

diff --git a/muttjump b/muttjump
index e7b5cdb64cf6a7cb70658e5b881524391de85d17..d32a8aea3009d94b613fd9d8667ce8adaf2ad7a5 100755 (executable)
--- a/muttjump
+++ b/muttjump
@@ -54,6 +54,10 @@ function die () {
     exit 1
 }
 
     exit 1
 }
 

+function quote () {
+    echo \'${1//\'/\'\\\'\'}\'
+}
+

 # Check command-line arguments and STDIN
 if tty -s || [ $# -ne 0 ] ; then
     cat >&2 <<END
 # Check command-line arguments and STDIN
 if tty -s || [ $# -ne 0 ] ; then
     cat >&2 <<END


@@ -126,7 +130,7 @@ fi
 # get containing maildir of $orig_msgfile
 orig_maildir=$(dirname $(dirname "$orig_msgfile"))
 if [ ! -d "$orig_maildir/cur" ] ; then
 # get containing maildir of $orig_msgfile
 orig_maildir=$(dirname $(dirname "$orig_msgfile"))
 if [ ! -d "$orig_maildir/cur" ] ; then

-    die "directory \"$orig_maildir\" doesn't exist or is no Maildir"
+    die "directory $(quote $orig_maildir) doesn't exist or is no Maildir"

 fi
 
 jump_cmd="<change-folder>$orig_maildir<enter><$MUTTJUMP_MODE>~i '$msgid'<enter>"
 fi
 
 jump_cmd="<change-folder>$orig_maildir<enter><$MUTTJUMP_MODE>~i '$msgid'<enter>"


@@ -146,15 +150,16 @@ if [ "$MUTTJUMP_USE_SCREEN" = no ] ; then
 else
 
     screen_window_name=$(MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE "$orig_maildir")
 else
 
     screen_window_name=$(MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE "$orig_maildir")

-    screen_opts=""
+    declare -a screen_opts

     if [ -n "$MUTTJUMP_SCREEN_SESSION" ] ; then
     if [ -n "$MUTTJUMP_SCREEN_SESSION" ] ; then

-        screen_opts="-S $MUTTJUMP_SCREEN_SESSION"
+        screen_opts=("-S" "$MUTTJUMP_SCREEN_SESSION")
+        screen_opts_str="-S $(quote "$MUTTJUMP_SCREEN_SESSION")"

     fi
 
     fi
 

-    $SCREEN $screen_opts -X eval "select $screen_window_name" "stuff \":push \\\"$jump_cmd\\\"
+    $SCREEN "${screen_opts[@]}" -X eval "select \"$screen_window_name\"" "stuff \":push \\\"$jump_cmd\\\"

 \""
     if [ $? != 0 ] ; then
         die "You have to manually start a screen session with:
 \""
     if [ $? != 0 ] ; then
         die "You have to manually start a screen session with:

-$SCREEN $screen_opts -t $screen_window_name $MUTT -f \"$orig_maildir\""
+$SCREEN $screen_opts_str -t $(quote "$screen_window_name") $MUTT -f $(quote "$orig_maildir")"

     fi
 fi
     fi
 fi