Improve usage of run_on_docker.sh

trinodb · Oct 7, 2019 · ba3c4db · ba3c4db
1 parent 9c1b9d8
commit ba3c4db
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 18 deletions.
diff --git a/presto-product-tests/bin/lib.sh b/presto-product-tests/bin/lib.sh
@@ -59,3 +59,10 @@ function getAvailableEnvironments() {
      | grep -v files | grep -v common | xargs -n1 basename
 }
 
+function usage() {
+  echo "Usage: $0 <environment> $@"
+  echo
+  echo "Where <environment> is one of following:"
+  getAvailableEnvironments | sort | sed 's/^/    - /'
+  exit 1
+}
diff --git a/presto-product-tests/bin/run_on_docker.sh b/presto-product-tests/bin/run_on_docker.sh
@@ -77,13 +77,8 @@ function terminate() {
   exit 130
 }
 
-function usage() {
-  echo "Usage: run_on_docker.sh <`getAvailableEnvironments | tr '\n' '|' | sed 's/|$//'`> <product test args>"
-  exit 1
- }
-
 if [[ $# == 0 ]]; then
-  usage
+  usage "<product test arguments>"
 fi
 
 ENVIRONMENT=$1

diff --git a/presto-product-tests/bin/run_presto_cli_on_docker.sh b/presto-product-tests/bin/run_presto_cli_on_docker.sh
@@ -4,13 +4,8 @@ set -euo pipefail
 
 source "${BASH_SOURCE%/*}/lib.sh"
 
-function usage() {
-  echo "Usage: $0 <`getAvailableEnvironments | tr '\n' '|' | sed 's/|$//'`> <presto cli args>"
-  exit 1
- }
-
 if [[ $# == 0 ]]; then
-  usage
+  usage "<presto cli arguments>"
 fi
 
 ENVIRONMENT=$1

diff --git a/presto-product-tests/bin/run_tempto_on_docker.sh b/presto-product-tests/bin/run_tempto_on_docker.sh
@@ -4,13 +4,8 @@ set -euo pipefail
 
 source "${BASH_SOURCE%/*}/lib.sh"
 
-function usage() {
-  echo "Usage: $0 <`getAvailableEnvironments | tr '\n' '|' | sed 's/|$//'`> <tempto args>"
-  exit 1
- }
-
 if [[ $# == 0 ]]; then
-  usage
+  usage "<tempto arguments>"
 fi
 
 ENVIRONMENT=$1