diff options
| author | Alexander Barton <alex@barton.de> | 2024-03-31 19:53:16 +0200 |
|---|---|---|
| committer | Alexander Barton <alex@barton.de> | 2024-04-05 23:16:07 +0200 |
| commit | 7e78c293a97239f895b862836c65c4b755abdc52 (patch) | |
| tree | 3a783304baa2588d9c3779a79a74d41356d3f308 /src/testsuite/getpid.sh | |
| parent | 8d6f2c2820567a350c57dd15cee06e13535471c2 (diff) | |
| download | ngircd-7e78c293a97239f895b862836c65c4b755abdc52.tar.gz ngircd-7e78c293a97239f895b862836c65c4b755abdc52.zip | |
Test suite: clean up scripts
- Reformat code. - Cleanup some glitches, streamline scripts ... - Enable "set -u": Error on unset variables. - Detect "$srcdir" in prep-server3 script, too.
Diffstat (limited to 'src/testsuite/getpid.sh')
| -rwxr-xr-x | src/testsuite/getpid.sh | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/src/testsuite/getpid.sh b/src/testsuite/getpid.sh index 04708e6c..55997ad8 100755 --- a/src/testsuite/getpid.sh +++ b/src/testsuite/getpid.sh @@ -1,29 +1,31 @@ #!/bin/sh # ngIRCd Test Suite +set -u + # did we get a name? [ $# -ne 1 ] && exit 1 -[ -x /bin/pidof ] && exec /bin/pidof -s $@ +[ -x /bin/pidof ] && exec /bin/pidof -s "$1" # detect flags for "ps" and "head" UNAME=`uname` if [ $UNAME = "FreeBSD" ]; then - PS_FLAGS="-a"; PS_PIDCOL="1"; HEAD_FLAGS="-n 1" + PS_FLAGS="-a"; PS_PIDCOL="1"; HEAD_FLAGS="-n 1" elif [ $UNAME = "A/UX" ]; then - PS_FLAGS="-af"; PS_PIDCOL="2"; HEAD_FLAGS="-1" + PS_FLAGS="-af"; PS_PIDCOL="2"; HEAD_FLAGS="-1" elif [ $UNAME = "GNU" ]; then - PS_FLAGS="-ax"; PS_PIDCOL="2"; HEAD_FLAGS="-n 1" + PS_FLAGS="-ax"; PS_PIDCOL="2"; HEAD_FLAGS="-n 1" elif [ $UNAME = "Haiku" ]; then - PS_FLAGS="-o Id -o Team"; PS_PIDCOL="1"; HEAD_FLAGS="-1" + PS_FLAGS="-o Id -o Team"; PS_PIDCOL="1"; HEAD_FLAGS="-1" elif [ $UNAME = "Linux" ]; then - PS_FLAGS="ax"; PS_PIDCOL="1"; HEAD_FLAGS="-n 1" + PS_FLAGS="ax"; PS_PIDCOL="1"; HEAD_FLAGS="-n 1" elif [ $UNAME = "SunOS" ]; then - PS_FLAGS="-af"; PS_PIDCOL=2; HEAD_FLAGS="-n 1" + PS_FLAGS="-af"; PS_PIDCOL=2; HEAD_FLAGS="-n 1" else - PS_FLAGS="-af"; PS_PIDCOL="2"; HEAD_FLAGS="-n 1" - ps $PS_FLAGS > /dev/null 2>&1 - if [ $? -ne 0 ]; then PS_FLAGS="a"; PS_PIDCOL="1"; fi + PS_FLAGS="-af"; PS_PIDCOL="2"; HEAD_FLAGS="-n 1" + ps $PS_FLAGS >/dev/null 2>&1 + if [ $? -ne 0 ]; then PS_FLAGS="a"; PS_PIDCOL="1"; fi fi # debug output @@ -33,19 +35,16 @@ fi #echo "$0: HEAD_FLAGS=$HEAD_FLAGS" # search PID -ps $PS_FLAGS > procs.tmp +ps $PS_FLAGS >procs.tmp cat procs.tmp | \ - grep -v "$0" | grep "$1" | \ - awk "{print \$$PS_PIDCOL}" | \ - sort -n > pids.tmp + grep -v "$0" | grep "$1" | \ + awk "{print \$$PS_PIDCOL}" | \ + sort -n >pids.tmp pid=`head $HEAD_FLAGS pids.tmp` rm -rf procs.tmp pids.tmp # validate PID -[ "$pid" -gt 1 ] > /dev/null 2>&1 -[ $? -ne 0 ] && exit 1 +[ "$pid" -gt 1 ] >/dev/null 2>&1 || exit 1 echo $pid exit 0 - -# -eof- |