# 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:-}
-
# function to create the screen window name from the full path of the mailbox
if ! type MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE >/dev/null 2>&1 ; then
function MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE () {
exit 1
}
+function reopen_tty () {
+ # 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$$ -otty=)"
+ exec < $term
+}
+
# Check command-line arguments and STDIN
search_header="Message-ID"
count=$(echo "$orig_msgfiles" | wc -l)
if [ $count -gt 1 -a -n "$DIALOG_PROG" ] ; then
choices=$(echo "$orig_msgfiles" | while read line ;
- do echo -e "$(dirname "$(dirname "$line")")\n." ; done)
+ do dirname "$(dirname "$line")" ; echo . ; done)
maxwidth=$(echo "$choices" | wc -L)
orig_maildir=$($DIALOG_PROG --clear --title "More than one mailbox found" \
--menu "Select mailbox:" $((count+8)) $((maxwidth+16)) \
$count $choices 3>&2 2>&1 1>&3-)
+elif [ $count -gt 1 ] ; then
+ choices=()
+ while read line ; do
+ choices=("${choices[@]}" "$(dirname "$(dirname "$line")")")
+ done <<<"$orig_msgfiles"
+ echo "More than one mailbox found"
+ echo "Select mailbox:"
+ select md in "${choices[@]}" ; do
+ orig_maildir=$md
+ break
+ done <> /dev/tty
else
- orig_msgfile=$(echo "$orig_msgfiles" | head -n1)
+ orig_msgfile=$orig_msgfiles
# get containing maildir of $orig_msgfile
orig_maildir=$(dirname "$(dirname "$orig_msgfile")")
fi
screen_opts=()
if [ "$MUTTJUMP_USE_SCREEN" = yes ] ; then
- [ -n "$STY" ] && screen_opts=("-X" "screen")
+ if [ -n "$STY" ] ; then
+ screen_opts=("-X" "screen")
+ else
+ reopen_tty
+ fi
screen_window_name=$(MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE "$orig_maildir")
screen_opts=("${screen_opts[@]}" "-t" "$screen_window_name")
else
SCREEN=""
- # 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$$ -otty=)"
- exec < $term
+ reopen_tty
fi
# start mutt, open original folder and jump to the original message
fi
screen_window_name=$(MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE "$orig_maildir")
- screen_opts=()
- if [ -n "$MUTTJUMP_SCREEN_SESSION" ] ; then
- screen_opts=("-S" "$MUTTJUMP_SCREEN_SESSION")
- screen_opts_str="-S $(quote "$MUTTJUMP_SCREEN_SESSION")"
- fi
-
- $SCREEN "${screen_opts[@]}" -p "$screen_window_name" -X eval "select '$screen_window_name'" "stuff \"$jump_cmd\""
- if [ $? != 0 ] ; then
- die "You have to manually start a screen session with:
-$SCREEN $screen_opts_str -t $(quote "$screen_window_name") $MUTT -f $(quote "$orig_maildir")"
- fi
+ $SCREEN -p "$screen_window_name" -X eval "select '$screen_window_name'" "stuff \"$jump_cmd\""
fi