Fix compilation warnings in mh.c

[apps/madmutt.git] / muttbug.sh.in

diff --git a/muttbug.sh.in b/muttbug.sh.in
index b3af077..2f73ab2 100644 (file)
--- a/muttbug.sh.in
+++ b/muttbug.sh.in
@@ -10,7 +10,7 @@
 
 #
 #     Copyright (c) 2000 Thomas Roessler <roessler@guug.de>
 
 #
 #     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
 #
 #     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
 # 
 #     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"
 #
 
 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
 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]:"
 fi
 
 echo "Please enter your e-mail address [$EMAIL]:"


@@ -176,7 +177,7 @@ esac
 
 if test -f /etc/debian_version ; then
        DEBIAN=yes
 
 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
        DEBIANVERSION="`dpkg -l muttng | grep '^[ih]' | awk '{print $3}'`" 2> /dev/null
        if test "$DEBIANVERSION" ; then
                DPKG=yes


@@ -184,7 +185,7 @@ if test -f /etc/debian_version ; then
                DPKG=no
                unset DEBIANVERSION
        fi
                DPKG=no
                unset DEBIANVERSION
        fi

-    if [ "$DPKG" == "yes" ] ; then
+    if [ "$DPKG" = "yes" ] ; then

        echo "$DPKG"
        echo $n "File this bug with Debian? [Y|n] $c"
        read DPKG
        echo "$DPKG"
        echo $n "File this bug with Debian? [Y|n] $c"
        read DPKG


@@ -197,15 +198,15 @@ else
        DEBIAN=no
        DPKG=no
 fi
        DEBIAN=no
        DPKG=no
 fi

-if [ "$DPKG" == "yes" ] ; then
+if [ "$DPKG" = "yes" ] ; then

     echo ""
     echo "Use reportbug muttng to report the bug to the debian bug tracking system..."
     exit
 fi
     echo ""
     echo "Use reportbug muttng to report the bug to the debian bug tracking system..."
     exit
 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 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; }'`"
 fi
 
 MUTTVERSION="`muttng -v | awk '{print $2 $3; exit; }'`"


@@ -217,11 +218,11 @@ test "$EMAIL"        && echo "From: $EMAIL"
 test "$REPLYTO"      && echo "Reply-To: $REPLYTO"
 test "$ORGANIZATION" && echo "Organization: $ORGANIZATION"
 
 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 "To: $SUBMIT"
 test "$EMAIL"       && echo "Bcc: ${EMAIL}"
 echo

-echo "Package: muttng"
+echo "Package: mutt-ng"

 echo "Version: ${DEBIANVERSION-${RPMVERSION-$MUTTVERSION}}"
 echo "Severity: $severity"
 echo 
 echo "Version: ${DEBIANVERSION-${RPMVERSION-$MUTTVERSION}}"
 echo "Severity: $severity"
 echo