From: Thomas Roessler <roessler@does-not-exist.org>
Date: Wed, 9 Feb 2000 18:23:05 +0000 (+0000)
Subject: Mostly Debian-related fixes from Roland Rosenfeld.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9f62af8cc410079539d5c4dcb8bbe1ad35e01950;p=neomutt

Mostly Debian-related fixes from Roland Rosenfeld.
---

diff --git a/muttbug.sh.in b/muttbug.sh.in
index 87a1bc5d5..928ec6355 100644
--- a/muttbug.sh.in
+++ b/muttbug.sh.in
@@ -162,30 +162,27 @@ esac
 if test -f /etc/debian_version ; then
 	DEBIAN=yes
 	echo $n "Checking whether mutt has been installed as a package... $c"
-	MUTTVERSION="`dpkg -l mutt | grep ^i | awk '{print $3}'`" 2> /dev/null
-	if test "$MUTTVERSION" ; then
+	DEBIANVERSION="`dpkg -l mutt | grep '^[ih] | awk '{print $3}'`" 2> /dev/null
+	if test "$DEBIANVERSION" ; then
 		DPKG=yes
 	else
 		DPKG=no
 	fi
 	echo "$DPKG"
-	if test "$DPKG" = "no" ; then
-		echo $n "File this bug with Debian? [Y|n] $c"
-		read DPKG
-		case "$DPKG" in
-		[nN])	DPKG=no ;;
-		*)	DPKG=yes ;;
-		esac
-	fi
+	echo $n "File this bug with Debian? [Y|n] $c"
+	read DPKG
+	case "$DPKG" in
+	[nN])	DPKG=no ;;
+	*)	DPKG=yes ;;
+	esac
 else
 	DEBIAN=no
 	DPKG=no
 fi
 
-test "$MUTTVERSION"  || MUTTVERSION="`mutt -v | head -1 | awk '{print $2}' | tr -d i`"
+MUTTVERSION="`mutt -v | head -1 | awk '{print $2}'`"
 test "$DPKG" = "yes" && SUBMIT="$SUBMIT, $DEBIAN_SUBMIT"
 
-
 exec > ${TEMPLATE}
 
 test "$EMAIL"        && echo "From: $EMAIL"
@@ -197,7 +194,7 @@ echo "To: $SUBMIT"
 echo "Bcc: ${EMAIL-$LOGNAME}"
 echo
 echo "Package: mutt"
-echo "Version: $MUTTVERSION"
+echo "Version: ${DEBIANVERSION-$MUTTVERSION}"
 echo "Severity: $severity"
 echo 
 echo "-- Please type your report below this line"