projects
/
muttjump
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use `mutt -f` instead of <change-folder>
[muttjump]
/
muttjump
diff --git
a/muttjump
b/muttjump
index 3cba9b794eb392dcf64116128f9dff027e554840..dd720343f85b1a69cf645d50d36f3e6ab8d0da29 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
@@
-71,6
+75,14
@@
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
msgid=$($FORMAIL -c -z -x Message-ID | head -n1)
# search for Message-ID in STDIN
if type -p $FORMAIL >/dev/null ; then
msgid=$($FORMAIL -c -z -x Message-ID | head -n1)
@@
-116,12
+128,12
@@
if [ -z "$orig_msgfile" -o ! -e "$orig_msgfile" ] ; then
fi
# get containing maildir of $orig_msgfile
fi
# get containing maildir of $orig_msgfile
-orig_maildir=$(dirname
$(dirname "$orig_msgfile")
)
+orig_maildir=$(dirname
"$(dirname "$orig_msgfile")"
)
if [ ! -d "$orig_maildir/cur" ] ; then
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
fi
-jump_cmd="<
change-folder>$orig_maildir<enter><
$MUTTJUMP_MODE>~i '$msgid'<enter>"
+jump_cmd="<$MUTTJUMP_MODE>~i '$msgid'<enter>"
if [ "$MUTTJUMP_USE_SCREEN" = no ] ; then
if [ "$MUTTJUMP_USE_SCREEN" = no ] ; then
@@
-133,20
+145,21
@@
if [ "$MUTTJUMP_USE_SCREEN" = no ] ; then
exec < $term
# start mutt, open original folder and jump to the original message
exec < $term
# start mutt, open original folder and jump to the original message
- $MUTT -e "push \"$jump_cmd\""
+ $MUTT -
f "$orig_maildir" -
e "push \"$jump_cmd\""
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[@]}" -p "$screen_window_name" -X select .
+
$SCREEN "${screen_opts[@]}" -p "$screen_window_name" -X stuff ":push \"$jump_cmd\"
\r
"
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?