From 9f16664552a473c1bd5fa896ce724689378a8ff4 Mon Sep 17 00:00:00 2001 From: Thomas Roessler Date: Thu, 3 Feb 2000 13:04:44 +0000 Subject: [PATCH] More changes to the bug report script. Most of them were suggest by Roland Rosenfeld. --- muttbug.sh.in | 54 +++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 48 insertions(+), 6 deletions(-) diff --git a/muttbug.sh.in b/muttbug.sh.in index 5aec60c0..99e12bda 100644 --- a/muttbug.sh.in +++ b/muttbug.sh.in @@ -65,6 +65,41 @@ echo "Please enter a one-line description of the problem you experience:" echo $n "> $c" read SUBJECT +cat < ${TEMPLATE} +test "$EMAIL" && echo "From: $EMAIL" +test "$REPLYTO" && echo "Reply-To: $REPLYTO" +test "$ORGANIZATION" && echo "Organization: $ORGANIZATION" + echo "Subject: mutt-$MUTTVERSION: $SUBJECT" echo "To: $SUBMIT" -echo "Cc: $LOGNAME" +echo "Cc: ${EMAIL-$LOGNAME}" echo echo "Package: mutt" echo "Version: $MUTTVERSION" +echo "Severity: $severity" echo echo "-- Please type your report below this line" echo @@ -170,6 +210,8 @@ if test "$global" = "yes" ; then fi fi +test "$EMAIL" && EMAIL="-f $EMAIL" + exec > /dev/tty cp $TEMPLATE $SCRATCH/mutt-bug.txt @@ -177,19 +219,19 @@ cp $TEMPLATE $SCRATCH/mutt-bug.txt input="e" while : ; do if test "$input" = "e" ; then - ${VISUAL-vi} $SCRATCH/mutt-bug.txt + ${VISUAL-${EDITOR-vi}} $SCRATCH/mutt-bug.txt if cmp $SCRATCH/mutt-bug.txt ${TEMPLATE} > /dev/null ; then echo "Warning: Bug report was not modified!" fi fi - echo $n "Submit, Edit, Print, Quit? [S|e|p|q]$c" + echo $n "Submit, Edit, View, Quit? [S|e|v|q]$c" read _input - input="`echo $_input | tr EPSQ epsq`" + input="`echo $_input | tr EVSQ evsq`" case $input in e*) ;; - p*) ${PAGER-more} $SCRATCH/mutt-bug.txt ;; - s*|"") @SENDMAIL@ -t < $SCRATCH/mutt-bug.txt ; exit ;; + v*) ${PAGER-more} $SCRATCH/mutt-bug.txt ;; + s*|"") @SENDMAIL@ $EMAIL -t < $SCRATCH/mutt-bug.txt ; exit ;; q*) exit esac done -- 2.49.0