chore: use strict mode for tests/*/*.sh

REF: etcd-io#15514 Signed-off-by: Wei Fu <fuweid89@gmail.com>
fuweid · Apr 13, 2023 · 8cd5969 · 8cd5969
1 parent 78d2ead
commit 8cd5969
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/tests/fixtures/gencerts.sh b/tests/fixtures/gencerts.sh
@@ -1,15 +1,21 @@
 #!/bin/bash
 
-set -e
+set -euo pipefail
 
 if ! [[ "$0" =~ "./gencerts.sh" ]]; then
   echo "must be run from 'fixtures'"
   exit 255
 fi
 
-if ! which cfssl; then
+if ! command -v cfssl; then
   echo "cfssl is not installed"
-  echo "use: go install -mod mod github.com/cloudflare/cfssl/cmd/cfssl github.com/cloudflare/cfssl/cmd/cfssljson"
+  echo "use: go install -mod mod github.com/cloudflare/cfssl/cmd/cfssl"
+  exit 255
+fi
+
+if ! command -v cfssljson; then
+  echo "cfssljson is not installed"
+  echo "use: go install -mod mod github.com/cloudflare/cfssl/cmd/cfssljson"
   exit 255
 fi
 

diff --git a/tests/integration/fixtures-expired/gencerts.sh b/tests/integration/fixtures-expired/gencerts.sh
@@ -1,12 +1,21 @@
 #!/bin/bash
 
+set -euo pipefail
+
 if ! [[ "$0" =~ "./gencerts.sh" ]]; then
   echo "must be run from 'fixtures'"
   exit 255
 fi
 
-if ! which cfssl; then
+if ! command -v cfssl; then
   echo "cfssl is not installed"
+  echo "use: go install -mod mod github.com/cloudflare/cfssl/cmd/cfssl"
+  exit 255
+fi
+
+if ! command -v cfssljson; then
+  echo "cfssljson is not installed"
+  echo "use: go install -mod mod github.com/cloudflare/cfssl/cmd/cfssljson"
   exit 255
 fi