diff --git a/wait-for b/wait-for index 077a8d3..d5c5e92 100755 --- a/wait-for +++ b/wait-for @@ -1,6 +1,6 @@ #!/bin/sh -TIMEOUT=15 +WAIT_TIMEOUT=15 QUIET=0 echoerr() { @@ -21,8 +21,8 @@ USAGE wait_for() { command="$*" - for i in `seq $TIMEOUT` ; do - nc -z "$HOST" "$PORT" > /dev/null 2>&1 + for i in `seq $WAIT_TIMEOUT` ; do + nc -z "$WAIT_HOST" "$WAIT_PORT" > /dev/null 2>&1 result=$? if [ $result -eq 0 ] ; then @@ -41,8 +41,8 @@ while [ $# -gt 0 ] do case "$1" in *:* ) - HOST=$(printf "%s\n" "$1"| cut -d : -f 1) - PORT=$(printf "%s\n" "$1"| cut -d : -f 2) + WAIT_HOST=$(printf "%s\n" "$1"| cut -d : -f 1) + WAIT_PORT=$(printf "%s\n" "$1"| cut -d : -f 2) shift 1 ;; -q | --quiet) @@ -50,12 +50,12 @@ do shift 1 ;; -t) - TIMEOUT="$2" - if [ "$TIMEOUT" = "" ]; then break; fi + WAIT_TIMEOUT="$2" + if [ "$WAIT_TIMEOUT" = "" ]; then break; fi shift 2 ;; --timeout=*) - TIMEOUT="${1#*=}" + WAIT_TIMEOUT="${1#*=}" shift 1 ;; --) @@ -72,7 +72,7 @@ do esac done -if [ "$HOST" = "" -o "$PORT" = "" ]; then +if [ "$WAIT_HOST" = "" -o "$WAIT_PORT" = "" ]; then echoerr "Error: you need to provide a host and port to test." usage 2 fi