projects
/
muttjump
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix quoting issues
[muttjump]
/
muttjump
diff --git
a/muttjump
b/muttjump
index 1f1632167cf18a1163cc2de6609fcbb092ddd939..d32a8aea3009d94b613fd9d8667ce8adaf2ad7a5 100755
(executable)
--- a/
muttjump
+++ b/
muttjump
@@
-47,12
+47,17
@@
MU=${MU:-mu}
NMZMAIL=${NMZMAIL:-nmzmail}
SCREEN=${SCREEN:-screen}
FORMAIL=${FORMAIL:-formail}
NMZMAIL=${NMZMAIL:-nmzmail}
SCREEN=${SCREEN:-screen}
FORMAIL=${FORMAIL:-formail}
+REFORMAIL=${REFORMAIL:-reformail}
function die () {
echo -e >&2 "$0: $1"
exit 1
}
function die () {
echo -e >&2 "$0: $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
@@
-70,9
+75,19
@@
if ! type -p $MUTT >/dev/null ; then
die "$MUTT is not in PATH, set MUTT variable"
fi
die "$MUTT is not in PATH, set MUTT variable"
fi
+case $MUTTJUMP_MODE in
+ limit|search)
+ ;;
+ *)
+ die "variable MUTTJUMP_MODE must be set to \"limit\" or \"search\""
+ ;;
+esac
+
# search for Message-ID in STDIN
if type -p $FORMAIL >/dev/null ; then
# search for Message-ID in STDIN
if type -p $FORMAIL >/dev/null ; then
- msgid=$(formail -c -z -x Message-ID | head -n1)
+ msgid=$($FORMAIL -c -z -x Message-ID | head -n1)
+elif type -p $REFORMAIL >/dev/null ; then
+ msgid=$($REFORMAIL -c -x Message-ID: | head -n1)
else
msgid=$(sed -n 's/^Message-ID: \(.*\)/\1/Ip' | head -n1)
fi
else
msgid=$(sed -n 's/^Message-ID: \(.*\)/\1/Ip' | head -n1)
fi
@@
-115,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>"
@@
-135,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
Benjamin Mako Hill
||
Want to submit a patch?