Adjust flea to use new submission address; check email for @

diff --git a/ChangeLog b/ChangeLog
index e874f1e21a989912c2607f782f1148d78963bb74..28512138534532a2f1f4e2586740ab95ef0f6484 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
-2007-03-31 16:07 -0700  Brendan Cully  <brendan@kublai.com>  (bf208df92829)
+2007-04-01 14:59 -0700  Brendan Cully  <brendan@kublai.com>  (c01a36ebe339)
+
+       * doc/muttbug.man, muttbug.sh.in: Restore muttbug
+
+2007-03-31 18:50 -0700  Brendan Cully  <brendan@kublai.com>  (f467353f5657)
+
+       * bcache.c, bcache.h, imap/message.c, pop.c, pop.h: Add tmp flag
+       to bcache_put, create bcache_commit.
 
        * imap/command.c, imap/imap.c: Allow IMAP FCC to reconnect if
        append fails (closes: #890)

diff --git a/muttbug.sh.in b/muttbug.sh.in
index 1d95a644b7df0e673d1b231e982ee224c88e6c05..f4059fee74bf7f16ee17395d5626eb1597638dfb 100644 (file)
--- a/muttbug.sh.in
+++ b/muttbug.sh.in
@@ -27,7 +27,7 @@
 #     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 
-SUBMIT="submit@bugs.guug.de"
+SUBMIT="fleas@mutt.org"
 DEBIAN_SUBMIT="submit@bugs.debian.org"
 
 prefix=@prefix@
@@ -101,13 +101,24 @@ if test -z "$EMAIL" ; then
        EMAIL="`mutt -Q from 2> /dev/null | sed -e 's/^from=.\(.*\).$/\1/'`"
 fi
 
-echo "Please enter your e-mail address [$EMAIL]:"
-echo $n "> $c"
-read EMAILTMP
+EMAILTMP=''
+while test -z "$EMAILTMP"
+do
+  echo "Please enter your e-mail address [$EMAIL]:"
+  echo $n "> $c"
+  read EMAILTMP
 
-if test -n "$EMAILTMP" ; then
-       EMAIL="$EMAILTMP"
-fi
+  if test -z "$EMAILTMP"; then EMAILTMP="$EMAIL"; fi
+
+  if ! echo "$EMAILTMP" | grep -q @
+  then
+    echo "$EMAILTMP does not appear to be a valid email address"
+    EMAILTMP=''
+    continue
+  fi
+
+  EMAIL="$EMAILTMP"
+done
 
 echo "Please enter a one-line description of the problem you experience:"
 echo $n "> $c"