X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=muttbug.sh.in;h=2f73ab227199f7656578081a9779a5716e6c9e08;hp=14a429f8c5c1fff8f81866466478847115728f9a;hb=63694769caa96f36675293e45a01e91cbe3175b4;hpb=690b892c671e252bb5187c9cab5246d3dcd16f4d

diff --git a/muttbug.sh.in b/muttbug.sh.in
index 14a429f..2f73ab2 100644
--- a/muttbug.sh.in
+++ b/muttbug.sh.in
@@ -10,7 +10,7 @@
 
 #
 #     Copyright (c) 2000 Thomas Roessler <roessler@guug.de>
-#
+#     Parts were written/modified by Nico Golde <nion@muttng.org>
 #
 #     This program is free software; you can redistribute it and/or modify
 #     it under the terms of the GNU General Public License as published by
@@ -24,7 +24,8 @@
 # 
 #     You should have received a copy of the GNU General Public License
 #     along with this program; if not, write to the Free Software
-#     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+#     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+#     USA.
 #
 
 SUBMIT="mutt-ng-devel@lists.berlios.de"
@@ -98,7 +99,7 @@ trap "rm -r -f ${SCRATCH} ; trap '' 0 ; exit" 0 1 2
 TEMPLATE=${SCRATCH}/template.txt
 
 if test -z "$EMAIL" ; then
-	EMAIL="`mutt -Q from 2> /dev/null | sed -e 's/^from=.\(.*\).$/\1/'`"
+	EMAIL="`muttng -Q from 2> /dev/null | sed -e 's/^from=.\(.*\).$/\1/'`"
 fi
 
 echo "Please enter your e-mail address [$EMAIL]:"
@@ -146,17 +147,18 @@ case "$severity" in
 4|[Cc]) severity=critical  ;;
      *) severity=normal    ;;
 esac
-
-if test -x $DEBUGGER ; then
-	test -f core && CORE=core
-	echo "If Mutt-ng has crashed, it may have saved some program state in"
-	echo "a file named core.  We can include this information with the bug"
-	echo "report if you wish so."
-	echo "Do you want to include information gathered from a core file?"
-	echo "If yes, please enter the path - otherwise just say no: [$CORE]"
-	echo $n "> $c"
-	read _CORE
-	test "$_CORE" && CORE="$_CORE"
+if [ "$severity" != "wishlist" ] ; then
+    if test -x $DEBUGGER ; then
+    	test -f core && CORE=core
+    	echo "If Mutt-ng has crashed, it may have saved some program state in"
+    	echo "a file named core.  We can include this information with the bug"
+    	echo "report if you wish so."
+    	echo "Do you want to include information gathered from a core file?"
+    	echo "If yes, please enter the path - otherwise just say no: [$CORE]"
+    	echo $n "> $c"
+    	read _CORE
+    	test "$_CORE" && CORE="$_CORE"
+    fi
 fi
 
 echo $n "Do you want to include your personal Mutt-ng configuration files? [Y|n] $c"
@@ -175,7 +177,7 @@ esac
 
 if test -f /etc/debian_version ; then
 	DEBIAN=yes
-	echo $n "Checking whether mutt-ng has been installed as a package... $c"
+	echo $n "Checking whether Mutt-ng has been installed as a Debian package... $c"
 	DEBIANVERSION="`dpkg -l muttng | grep '^[ih]' | awk '{print $3}'`" 2> /dev/null
 	if test "$DEBIANVERSION" ; then
 		DPKG=yes
@@ -183,22 +185,28 @@ if test -f /etc/debian_version ; then
 		DPKG=no
 		unset DEBIANVERSION
 	fi
-	echo "$DPKG"
-	echo $n "File this bug with Debian? [Y|n] $c"
-	read DPKG
-	case "$DPKG" in
-	[nN])	DPKG=no ;;
-	*)	DPKG=yes ;;
-	esac
+    if [ "$DPKG" = "yes" ] ; then
+    	echo "$DPKG"
+    	echo $n "File this bug with Debian? [Y|n] $c"
+    	read DPKG
+    	case "$DPKG" in
+    	[nN])	DPKG=no ;;
+    	*)	DPKG=yes ;;
+    	esac
+    fi
 else
 	DEBIAN=no
 	DPKG=no
 fi
-
-if rpm -q mutt > /dev/null 2> /dev/null ; then
-	echo "Mutt seems to come from an RPM package."
-	RPMVERSION="`rpm -q mutt`"
-	RPMPACKAGER="`rpm -q -i muttng | sed -n -e 's/^Packager *: *//p'`"
+if [ "$DPKG" = "yes" ] ; then
+    echo ""
+    echo "Use reportbug muttng to report the bug to the debian bug tracking system..."
+    exit
+fi
+if rpm -q mutt-ng > /dev/null 2> /dev/null ; then
+	echo "Mutt-ng seems to come from an RPM package."
+	RPMVERSION="`rpm -q mutt-ng`"
+	RPMPACKAGER="`rpm -q -i mutt-ng | sed -n -e 's/^Packager *: *//p'`"
 fi
 
 MUTTVERSION="`muttng -v | awk '{print $2 $3; exit; }'`"
@@ -210,11 +218,11 @@ test "$EMAIL"        && echo "From: $EMAIL"
 test "$REPLYTO"      && echo "Reply-To: $REPLYTO"
 test "$ORGANIZATION" && echo "Organization: $ORGANIZATION"
 
-echo "Subject: Mutt-ng-$MUTTVERSION: $SUBJECT"
+echo "Subject: Mutt-ng $MUTTVERSION: $SUBJECT"
 echo "To: $SUBMIT"
 test "$EMAIL" 	     && echo "Bcc: ${EMAIL}"
 echo
-echo "Package: muttng"
+echo "Package: mutt-ng"
 echo "Version: ${DEBIANVERSION-${RPMVERSION-$MUTTVERSION}}"
 echo "Severity: $severity"
 echo 
@@ -251,7 +259,6 @@ echo
 echo "- CFLAGS"
 echo @CFLAGS@
 
-
 echo
 echo "-- Mutt-ng Version Information"
 echo