diff options
| author | Alvaro Herrera | 2022-09-20 16:50:16 +0000 |
|---|---|---|
| committer | Alvaro Herrera | 2022-09-20 16:50:16 +0000 |
| commit | 3d53b9ef1a4cda7b6303a0496f8531eceeef0e77 (patch) | |
| tree | e9d89ace40c397ec331edd76cda894b34977c3fb /src/tools/pginclude | |
| parent | 152c9f7b8f01437780d9f87bfe945bba47efdd0a (diff) | |
Fix `trap` in a few shell scripts
The original `trap` lines in these scripts are incomplete: in case of
any signal, they delete the working directory but let the script run to
completion, which is useless because it will only proceed to complain
about the working directory being removed. Add `exit` there, with the
original exit value (not rm's).
Since this is mostly just cosmetic, no backpatch.
Discussion: https://postgr.es/m/[email protected]
Diffstat (limited to 'src/tools/pginclude')
| -rwxr-xr-x | src/tools/pginclude/cpluspluscheck | 2 | ||||
| -rwxr-xr-x | src/tools/pginclude/headerscheck | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/pginclude/cpluspluscheck b/src/tools/pginclude/cpluspluscheck index bffca18890c..b393f2a2eaa 100755 --- a/src/tools/pginclude/cpluspluscheck +++ b/src/tools/pginclude/cpluspluscheck @@ -50,7 +50,7 @@ done # Create temp directory. tmp=`mktemp -d /tmp/$me.XXXXXX` -trap 'rm -rf $tmp' 0 1 2 3 15 +trap "ret=$?; rm -rf $tmp; exit $ret" 0 1 2 3 15 exit_status=0 diff --git a/src/tools/pginclude/headerscheck b/src/tools/pginclude/headerscheck index bd45ee5e5c7..2a39856f88c 100755 --- a/src/tools/pginclude/headerscheck +++ b/src/tools/pginclude/headerscheck @@ -46,7 +46,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | sed "s|\\\$(PG_SYSROOT)|$PG_SYSROOT|g"` # Create temp directory. tmp=`mktemp -d /tmp/$me.XXXXXX` -trap 'rm -rf $tmp' 0 1 2 3 15 +trap "ret=$?; rm -rf $tmp; exit $ret" 0 1 2 3 15 exit_status=0 @@ -154,9 +154,9 @@ do EXTRAINCLUDES="$python_includespec" ;; src/interfaces/ecpg/*) EXTRAINCLUDES="-I $builddir/src/interfaces/ecpg/include -I $srcdir/src/interfaces/ecpg/include" ;; - src/backend/parser/*) + src/backend/parser/*) EXTRAINCLUDES="-I $builddir/src/backend/parser/" ;; - src/backend/utils/adt/*) + src/backend/utils/adt/*) EXTRAINCLUDES="-I $builddir/src/backend/utils/adt/" ;; *) EXTRAINCLUDES="" ;; |