Skip to content

Commit 50d1a64

Browse files
committed
pgtest: update shell script to use more modern syntax
script is src/tools/pgtest Backpatch-through: master
1 parent af720b4 commit 50d1a64

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

src/tools/pgtest

+11-11
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ trap "ret=$?; rm -rf /tmp/$$; exit $ret" 0 1 2 3 15
1818
mkdir /tmp/$$
1919
TMP="/tmp/$$"
2020

21-
if [ "X$1" != "X-n" ]
21+
if [ "$1" != "-n" ]
2222
then CLEAN="Y"
23-
else CLEAN=""
23+
else CLEAN="N"
2424
shift
2525
fi
2626

@@ -29,22 +29,22 @@ rm -f tmp_install/log/install.log
2929
# Run "make check" and store return code in $TMP/ret.
3030
# Display output but also capture it in $TMP/0.
3131
(
32-
if [ "$CLEAN" ]
32+
if [ "$CLEAN" = 'Y' ]
3333
then $MAKE "$@" clean 2>&1
34-
echo "$?" > $TMP/ret
34+
echo "$?" > "$TMP"/ret
3535
fi
36-
if [ $(cat $TMP/ret) -eq 0 ]
36+
if [ "$(cat "$TMP"/ret)" -eq 0 ]
3737
then $MAKE "$@" 2>&1 && $MAKE "$@" check 2>&1
38-
echo "$?" > $TMP/ret
38+
echo "$?" > "$TMP"/ret
3939
fi
40-
) | tee $TMP/0
40+
) | tee "$TMP"/0
4141

4242
# Grab possible warnings from install.log
43-
[ -e tmp_install/log/install.log ] && cat tmp_install/log/install.log >> $TMP/0
43+
[ -e tmp_install/log/install.log ] && cat tmp_install/log/install.log >> "$TMP"/0
4444

4545
# If success, display warnings
46-
if [ $(cat $TMP/ret) -eq 0 ]
47-
then cat $TMP/0 |
46+
if [ "$(cat "$TMP"/ret)" -eq 0 ]
47+
then cat "$TMP"/0 |
4848
# The following grep's have to be adjusted for your setup because
4949
# certain warnings are acceptable.
5050
grep -i warning |
@@ -54,4 +54,4 @@ then cat $TMP/0 |
5454
fi
5555

5656
# return original make error code
57-
exit `cat $TMP/ret`
57+
exit "$(cat "$TMP"/ret)"

0 commit comments

Comments
 (0)