don't restart on non-fatal errors; use the error reporting counters

[unix-history] / usr / src / libexec / bugfiler / sendbug.sh

diff --git a/usr/src/libexec/bugfiler/sendbug.sh b/usr/src/libexec/bugfiler/sendbug.sh
index 23a3f29..00847c5 100644 (file)
--- a/usr/src/libexec/bugfiler/sendbug.sh
+++ b/usr/src/libexec/bugfiler/sendbug.sh
@@ -4,18 +4,19 @@
 # All rights reserved.  The Berkeley software License Agreement
 # specifies the terms and conditions for redistribution.
 #
 # All rights reserved.  The Berkeley software License Agreement
 # specifies the terms and conditions for redistribution.
 #

-#      @(#)sendbug.sh  5.3 (Berkeley) 85/08/09
+#      @(#)sendbug.sh  5.6 (Berkeley) 86/02/12

 #
 # Create a bug report and mail to '4bsd-bugs'.
 #
 
 TEMP=/tmp/bug$$
 #
 # Create a bug report and mail to '4bsd-bugs'.
 #
 
 TEMP=/tmp/bug$$

-FORMAT=/usr/ucb/bugformat
+FORMAT=/usr/lib/bugformat

 
 

-: ${BUGADDR=4bsd-bugs@ucbarpa.BERKELEY.EDU}
+# uucp sites should use ": ${BUGADDR=ucbvax!4bsd-bugs}" with a suitable path.
+: ${BUGADDR=4bsd-bugs@BERKELEY.EDU}

 : ${EDITOR=/usr/ucb/vi}
 
 : ${EDITOR=/usr/ucb/vi}
 

-trap '/bin/rm -f $TEMP' 0 1 2 3 13 15
+trap '/bin/rm -f $TEMP ; exit 1' 1 2 3 13 15

 
 /bin/cp $FORMAT $TEMP
 if $EDITOR $TEMP
 
 /bin/cp $FORMAT $TEMP
 if $EDITOR $TEMP


@@ -30,3 +31,5 @@ then
        *) /usr/lib/sendmail -t -oi "$@" < $TEMP ;;
        esac
 fi
        *) /usr/lib/sendmail -t -oi "$@" < $TEMP ;;
        esac
 fi

+
+/bin/rm -f $TEMP