[Groff-commit] groff ChangeLog contrib/eqn2graph/eqn2graph.sh ...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     10/02/25 20:17:13

Modified files:
        .              : ChangeLog 
        contrib/eqn2graph: eqn2graph.sh 
        contrib/grap2graph: grap2graph.sh 
        contrib/pic2graph: pic2graph.sh 

Log message:
        Use named signals for `trap' in shell scripts.
        
        * contrib/eqn2graph/eqn2graph.sh, contrib/grap2graph/grap2/graph.sh,
        contrib/pic2graph/pic2graph.sh: Do it.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1226&r2=1.1227
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/eqn2graph/eqn2graph.sh?cvsroot=groff&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/grap2graph/grap2graph.sh?cvsroot=groff&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/pic2graph/pic2graph.sh?cvsroot=groff&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1226
retrieving revision 1.1227
diff -u -b -r1.1226 -r1.1227
--- ChangeLog   25 Feb 2010 19:34:08 -0000      1.1226
+++ ChangeLog   25 Feb 2010 20:17:11 -0000      1.1227
@@ -1,3 +1,10 @@
+2010-02-25  Colin Watson  <address@hidden>
+
+       Use named signals for `trap' in shell scripts.
+
+       * contrib/eqn2graph/eqn2graph.sh, contrib/grap2graph/grap2/graph.sh,
+       contrib/pic2graph/pic2graph.sh: Do it.
+
 2010-02-25  Werner LEMBERG  <address@hidden>
 
        Fix angle brackets in grohtml.

Index: contrib/eqn2graph/eqn2graph.sh
===================================================================
RCS file: /cvsroot/groff/groff/contrib/eqn2graph/eqn2graph.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- contrib/eqn2graph/eqn2graph.sh      29 Sep 2008 00:53:29 -0000      1.6
+++ contrib/eqn2graph/eqn2graph.sh      25 Feb 2010 20:17:13 -0000      1.7
@@ -32,7 +32,7 @@
 #
 # Thus, we pass -U to groff(1), and everything else to convert(1).
 #
-# $Id: eqn2graph.sh,v 1.6 2008/09/29 00:53:29 esr Exp $
+# $Id: eqn2graph.sh,v 1.7 2010/02/25 20:17:13 wl Exp $
 #
 groff_opts=""
 convert_opts=""
@@ -75,7 +75,7 @@
     { (exit 1); exit 1; }
 fi
 
-trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 2 15 
+trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' EXIT INT TERM
 
 # Here goes:
 # 1. Add .EQ/.EN.

Index: contrib/grap2graph/grap2graph.sh
===================================================================
RCS file: /cvsroot/groff/groff/contrib/grap2graph/grap2graph.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- contrib/grap2graph/grap2graph.sh    18 May 2005 07:03:06 -0000      1.4
+++ contrib/grap2graph/grap2graph.sh    25 Feb 2010 20:17:13 -0000      1.5
@@ -28,7 +28,7 @@
 #
 # Thus, we pass -U to groff(1), and everything else to convert(1).
 #
-# $Id: grap2graph.sh,v 1.4 2005/05/18 07:03:06 wl Exp $
+# $Id: grap2graph.sh,v 1.5 2010/02/25 20:17:13 wl Exp $
 #
 groff_opts=""
 convert_opts=""
@@ -71,7 +71,7 @@
     { (exit 1); exit 1; }
 fi
 
-trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 2 15 
+trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' EXIT INT TERM
 
 # Here goes:
 # 1. Add .G1/.G2.

Index: contrib/pic2graph/pic2graph.sh
===================================================================
RCS file: /cvsroot/groff/groff/contrib/pic2graph/pic2graph.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- contrib/pic2graph/pic2graph.sh      29 Sep 2008 00:53:29 -0000      1.8
+++ contrib/pic2graph/pic2graph.sh      25 Feb 2010 20:17:13 -0000      1.9
@@ -32,7 +32,7 @@
 # We don't have complete option coverage on eqn because this is primarily
 # intended as a pic translator; we can live with eqn defaults. 
 #
-# $Id: pic2graph.sh,v 1.8 2008/09/29 00:53:29 esr Exp $
+# $Id: pic2graph.sh,v 1.9 2010/02/25 20:17:13 wl Exp $
 #
 groffpic_opts=""
 gs_opts=""
@@ -86,7 +86,7 @@
     { (exit 1); exit 1; }
 fi
 
-trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 2 15 
+trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' EXIT INT TERM
 
 # Here goes:
 # 1. Wrap the input in dummy .PS/PE macros (and add possibly null .EQ/.EN)