github/wait-for
0
0
Fork 0
mirror of https://github.com/thegeeklab/wait-for.git synced 2024-11-28 15:20:35 +00:00
Code Issues Projects Releases Wiki Activity

fix: fix syntax while using bash fallbacks (#53)

Browse Source
This commit is contained in:
Robert Kaussow 2023-03-02 13:40:42 +01:00 committed by GitHub
parent 847108a7c9
commit 39a235a9e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wait-for
View File

@ -3,9 +3,6 @@
WAITFOR_TIMEOUT=${WAITFOR_TIMEOUT:-15} WAITFOR_TIMEOUT=${WAITFOR_TIMEOUT:-15}
WAITFOR_QUIET=${WAITFOR_QUIET:-0} WAITFOR_QUIET=${WAITFOR_QUIET:-0}
HAS_NC=0
HAS_BASH=0
echoerr() { echoerr() {
if [ "$WAITFOR_QUIET" -ne 1 ]; then printf "%s\n" "$*" 1>&2; fi if [ "$WAITFOR_QUIET" -ne 1 ]; then printf "%s\n" "$*" 1>&2; fi
} }
@ -27,9 +24,9 @@ USAGE
wait_for() { wait_for() {
for _ in $(seq "$WAITFOR_TIMEOUT"); do for _ in $(seq "$WAITFOR_TIMEOUT"); do
if [ $HAS_NC = 1 ]; then if [ "$HAS_NC" = 1 ]; then
nc -w 1 -z "$WAITFOR_HOST" "$WAITFOR_PORT" >/dev/null 2>&1 nc -w 1 -z "$WAITFOR_HOST" "$WAITFOR_PORT" >/dev/null 2>&1
elif [ $HAS_BASH = 1 ]; then elif [ "$HAS_BASH" = 1 ]; then
# shellcheck disable=SC3025 # shellcheck disable=SC3025
bash -c "</dev/tcp/$WAITFOR_HOST/$WAITFOR_PORT" >/dev/null 2>&1 bash -c "</dev/tcp/$WAITFOR_HOST/$WAITFOR_PORT" >/dev/null 2>&1
fi fi
@ -89,7 +86,7 @@ if [ -x "$(command -v bash)" ]; then
HAS_BASH=1 HAS_BASH=1
fi fi
if [ $HAS_NC = 0 ] || [ $HAS_BASH = 0 ]; then if [ "$HAS_NC" != 1 ] || [ "$HAS_BASH" != 1 ]; then
echoerr "error: netcat or bash is required for wait-for to run" echoerr "error: netcat or bash is required for wait-for to run"
exit 1 exit 1
fi fi