From 602c27c806f60ddbe77bb2ec9495ee499c8805ed Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Fri, 10 Sep 2004 18:47:08 +0000 Subject: [PATCH] * lib/compile, lib/elisp-comp, lib/install-sh, lib/ylwrap: Use $ret instead of $status which is read-only in Zsh. --- ChangeLog | 5 +++++ lib/compile | 4 ++-- lib/elisp-comp | 6 +++--- lib/install-sh | 4 ++-- lib/ylwrap | 16 ++++++++-------- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4115c3191..e14e70b8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-09-10 Alexandre Duret-Lutz + + * lib/compile, lib/elisp-comp, lib/install-sh, lib/ylwrap: Use $ret + instead of $status which is read-only in Zsh. + 2004-09-10 Ralf Wildenhues Alexandre Duret-Lutz diff --git a/lib/compile b/lib/compile index e6084f46e..80b645b01 100755 --- a/lib/compile +++ b/lib/compile @@ -121,14 +121,14 @@ trap "rmdir '$lockdir'; exit 1" 1 2 15 # Run the compile. "$@" -status=$? +ret=$? if test -f "$cofile"; then mv "$cofile" "$ofile" fi rmdir "$lockdir" -exit $status +exit $ret # Local Variables: # mode: shell-script diff --git a/lib/elisp-comp b/lib/elisp-comp index 489ae83d7..7efb6f89e 100755 --- a/lib/elisp-comp +++ b/lib/elisp-comp @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright (C) 1995, 2000, 2003 Free Software Foundation, Inc. +# Copyright (C) 1995, 2000, 2003, 2004 Free Software Foundation, Inc. -scriptversion=2003-11-08.23 +scriptversion=2004-09-10.20 # Franc,ois Pinard , 1995. # @@ -64,7 +64,7 @@ fi tempdir=elc.$$ # Cleanup the temporary directory on exit. -trap 'status=$?; rm -rf "$tempdir" && exit $status' 0 +trap 'ret=$?; rm -rf "$tempdir" && exit $ret' 0 trap '(exit $?); exit' 1 2 13 15 mkdir $tempdir diff --git a/lib/install-sh b/lib/install-sh index b777f1244..dd97db7aa 100755 --- a/lib/install-sh +++ b/lib/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2004-07-05.00 +scriptversion=2004-09-10.20 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -260,7 +260,7 @@ do rmtmp=$dstdir/_rm.$$_ # Trap to clean up those temp files at exit. - trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 trap '(exit $?); exit' 1 2 13 15 # Copy the file name to the temp name. diff --git a/lib/ylwrap b/lib/ylwrap index f86e21730..e66a95b60 100755 --- a/lib/ylwrap +++ b/lib/ylwrap @@ -1,9 +1,9 @@ #! /bin/sh # ylwrap - wrapper for lex/yacc invocations. -scriptversion=2003-11-18.20 +scriptversion=2004-09-10.20 -# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003 +# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. # # Written by Tom Tromey . @@ -109,9 +109,9 @@ case $# in 0) $prog "$input" ;; *) $prog "$@" "$input" ;; esac -status=$? +ret=$? -if test $status -eq 0; then +if test $ret -eq 0; then set X $pairlist shift first=yes @@ -177,7 +177,7 @@ if test $status -eq 0; then -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'` sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \ - -e "s,$FROM,$TARGET," "$from" >"$target" || status=$? + -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$? # Check whether header files must be updated. if test $first = no; then @@ -195,7 +195,7 @@ if test $status -eq 0; then # is not specified, we don't want an error when the header # file is "missing". if test $first = yes; then - status=1 + ret=1 fi fi shift @@ -203,14 +203,14 @@ if test $status -eq 0; then first=no done else - status=$? + ret=$? fi # Remove the directory. cd .. rm -rf $dirname -exit $status +exit $ret # Local Variables: # mode: shell-script -- 2.47.2