tweak Message-ID regexp

[muttjump] / muttjump

diff --git a/muttjump b/muttjump
index 351e3ac17019c3eb3d83dd9890f972acf2606de3..8ff2625d3a63462ca455c282a68077d9e5d10341 100755 (executable)
--- a/muttjump
+++ b/muttjump
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 # written by Johannes Weißl
 
 # muttjump
@@ -89,7 +89,7 @@ if type -p $FORMAIL >/dev/null ; then
 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"
@@ -143,7 +143,7 @@ if [ "$MUTTJUMP_USE_SCREEN" = no ] ; then
     # 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