projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
muttbug.sh.in
diff --git
a/muttbug.sh.in
b/muttbug.sh.in
index
df65431
..
14a429f
100644
(file)
--- a/
muttbug.sh.in
+++ b/
muttbug.sh.in
@@
-5,7
+5,7
@@
#
#
#
#
-# $Id: muttbug.sh.in,v 3.
6 2003/09/20 06:24:10
roessler Exp $
+# $Id: muttbug.sh.in,v 3.
7 2005/01/09 15:35:51
roessler Exp $
#
#
#
#
@@
-27,7
+27,7
@@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
#
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
#
-SUBMIT="
submit@bugs.guug
.de"
+SUBMIT="
mutt-ng-devel@lists.berlios
.de"
DEBIAN_SUBMIT="submit@bugs.debian.org"
prefix=@prefix@
DEBIAN_SUBMIT="submit@bugs.debian.org"
prefix=@prefix@
@@
-149,7
+149,7
@@
esac
if test -x $DEBUGGER ; then
test -f core && CORE=core
if test -x $DEBUGGER ; then
test -f core && CORE=core
- echo "If
mutt
has crashed, it may have saved some program state in"
+ 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 "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?"
@@
-159,14
+159,14
@@
if test -x $DEBUGGER ; then
test "$_CORE" && CORE="$_CORE"
fi
test "$_CORE" && CORE="$_CORE"
fi
-echo $n "Do you want to include your personal
mutt
configuration files? [Y|n] $c"
+echo $n "Do you want to include your personal
Mutt-ng
configuration files? [Y|n] $c"
read personal
case "$personal" in
[nN]*) personal=no ;;
*) personal=yes ;;
esac
read personal
case "$personal" in
[nN]*) personal=no ;;
*) personal=yes ;;
esac
-echo $n "Do you want to include your system's global
mutt
configuration file? [Y|n] $c"
+echo $n "Do you want to include your system's global
Mutt-ng
configuration file? [Y|n] $c"
read global
case "$global" in
[nN]*) global=no ;;
read global
case "$global" in
[nN]*) global=no ;;
@@
-175,8
+175,8
@@
esac
if test -f /etc/debian_version ; then
DEBIAN=yes
if test -f /etc/debian_version ; then
DEBIAN=yes
- echo $n "Checking whether mutt has been installed as a package... $c"
- DEBIANVERSION="`dpkg -l mutt | grep '^[ih]' | awk '{print $3}'`" 2> /dev/null
+ echo $n "Checking whether mutt
-ng
has been installed as a package... $c"
+ DEBIANVERSION="`dpkg -l mutt
ng
| grep '^[ih]' | awk '{print $3}'`" 2> /dev/null
if test "$DEBIANVERSION" ; then
DPKG=yes
else
if test "$DEBIANVERSION" ; then
DPKG=yes
else
@@
-198,10
+198,10
@@
fi
if rpm -q mutt > /dev/null 2> /dev/null ; then
echo "Mutt seems to come from an RPM package."
RPMVERSION="`rpm -q mutt`"
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 mutt | sed -n -e 's/^Packager *: *//p'`"
+ RPMPACKAGER="`rpm -q -i mutt
ng
| sed -n -e 's/^Packager *: *//p'`"
fi
fi
-MUTTVERSION="`mutt
-v | awk '{print $2
; exit; }'`"
+MUTTVERSION="`mutt
ng -v | awk '{print $2 $3
; exit; }'`"
test "$DPKG" = "yes" && SUBMIT="$SUBMIT, $DEBIAN_SUBMIT"
exec > ${TEMPLATE}
test "$DPKG" = "yes" && SUBMIT="$SUBMIT, $DEBIAN_SUBMIT"
exec > ${TEMPLATE}
@@
-210,11
+210,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
-$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: mutt"
+echo "Package: mutt
ng
"
echo "Version: ${DEBIANVERSION-${RPMVERSION-$MUTTVERSION}}"
echo "Severity: $severity"
echo
echo "Version: ${DEBIANVERSION-${RPMVERSION-$MUTTVERSION}}"
echo "Severity: $severity"
echo
@@
-225,7
+225,7
@@
echo
if test "$DEBIAN" = "yes" ; then
echo "Obtaining Debian-specific information..." > /dev/tty
if test "$DEBIAN" = "yes" ; then
echo "Obtaining Debian-specific information..." > /dev/tty
- bug -p -s dummy mutt < /dev/null 2> /dev/null | \
+ bug -p -s dummy mutt
ng
< /dev/null 2> /dev/null | \
sed -n -e "/^-- System Information/,/^---/p" | \
grep -v '^---'
else
sed -n -e "/^-- System Information/,/^---/p" | \
grep -v '^---'
else
@@
-253,9
+253,9
@@
echo @CFLAGS@
echo
echo
-echo "-- Mutt Version Information"
+echo "-- Mutt
-ng
Version Information"
echo
echo
-mutt -v
+mutt
ng
-v
if test "$CORE" && test -f "$CORE" ; then
echo
if test "$CORE" && test -f "$CORE" ; then
echo
@@
-272,7
+272,7
@@
if test "$CORE" && test -f "$CORE" ; then
fi
if test "$personal" = "yes" ; then
fi
if test "$personal" = "yes" ; then
- CANDIDATES=".mutt
rc-${MUTTVERSION} .muttrc .mutt/muttrc-${MUTTVERSION} .mutt/mutt
rc"
+ CANDIDATES=".mutt
ngrc-${MUTTVERSION} .muttngrc .muttng/muttngrc-${MUTTVERSION} .muttng/muttng
rc"
MATCHED="none"
for f in $CANDIDATES; do
if test -f "${HOME}/$f" ; then
MATCHED="none"
for f in $CANDIDATES; do
if test -f "${HOME}/$f" ; then
@@
-282,7
+282,7
@@
if test "$personal" = "yes" ; then
done
if test "$MATCHED" = "none" ; then
done
if test "$MATCHED" = "none" ; then
- echo "Warning: Can't find your personal .muttrc." >&2
+ echo "Warning: Can't find your personal .mutt
ng
rc." >&2
else
include_file $MATCHED
fi
else
include_file $MATCHED
fi
@@
-290,7
+290,7
@@
fi
if test "$global" = "yes" ; then
if test "$global" = "yes" ; then
- CANDIDATES="Mutt
rc-${MUTTVERSION} Mutt
rc"
+ CANDIDATES="Mutt
ngrc-${MUTTVERSION} Muttng
rc"
DIRECTORIES="$sysconfdir $pkgdatadir"
MATCHED="none"
for d in $DIRECTORIES ; do
DIRECTORIES="$sysconfdir $pkgdatadir"
MATCHED="none"
for d in $DIRECTORIES ; do
@@
-304,7
+304,7
@@
if test "$global" = "yes" ; then
done
if test "$MATCHED" = "none" ; then
done
if test "$MATCHED" = "none" ; then
- echo "Warning: Can't find global Muttrc." >&2
+ echo "Warning: Can't find global Mutt
ng
rc." >&2
else
include_file $MATCHED
fi
else
include_file $MATCHED
fi