exit 1
}
+function quote () {
+ echo \'${1//\'/\'\\\'\'}\'
+}
+
# Check command-line arguments and STDIN
if tty -s || [ $# -ne 0 ] ; then
cat >&2 <<END
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)
+ msgid=$(sed -n 's/^Message-ID:[ \t]*\(.*\)/\1/Ip' | head -n1)
fi
if [ -z "$msgid" ] ; then
die "could not find Message-ID header in standard input"
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
- 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>"
+jump_expr="~i'$msgid'"
if [ "$MUTTJUMP_USE_SCREEN" = no ] ; then
+ jump_cmd="<$MUTTJUMP_MODE>$jump_expr<enter>"
+
# Close message-stdin and open terminal-stdin instead.
# mutt behaves different if STDIN is no terminal
# TODO: Find cleaner solution (e.g. mutt command-line argument?)
exec 0<&-
- term="/dev/$(ps -p$$ --no-heading | awk '{print $2}')"
+ term="/dev/$(ps -p$$ | awk 'END { print $2 }')"
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
+ case $MUTTJUMP_MODE in
+ limit)
+ jump_cmd="l$jump_expr"
+ ;;
+ search)
+ jump_cmd="/$jump_expr"
+ ;;
+ esac
+
screen_window_name=$(MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE "$orig_maildir")
- screen_opts=""
+ declare -a screen_opts
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
- $SCREEN $screen_opts -X eval "select $screen_window_name" "stuff \":push \\\"$jump_cmd\\\"
-\""
+ $SCREEN "${screen_opts[@]}" -p "$screen_window_name" -X eval "select '$screen_window_name'" "stuff \"$jump_cmd\r\""
+
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