diff --git a/deploy/k8s/central.sh b/deploy/k8s/central.sh index a7f187191c092..8c4f57d868ac5 100755 --- a/deploy/k8s/central.sh +++ b/deploy/k8s/central.sh @@ -1,12 +1,13 @@ #!/usr/bin/env bash +# shellcheck disable=SC1091 set -e K8S_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" COMMON_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../common && pwd)" -source $COMMON_DIR/env.sh -source $COMMON_DIR/deploy.sh -source $COMMON_DIR/k8sbased.sh -source $K8S_DIR/env.sh +source "$COMMON_DIR"/env.sh +source "$COMMON_DIR"/deploy.sh +source "$COMMON_DIR"/k8sbased.sh +source "$K8S_DIR"/env.sh launch_central "$K8S_DIR" diff --git a/deploy/k8s/sensor.sh b/deploy/k8s/sensor.sh index 19628f80d0916..4dabb06a7e237 100755 --- a/deploy/k8s/sensor.sh +++ b/deploy/k8s/sensor.sh @@ -1,16 +1,17 @@ #!/usr/bin/env bash +# shellcheck disable=SC1091 set -e K8S_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" COMMON_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../common && pwd)" -source $COMMON_DIR/deploy.sh -source $COMMON_DIR/k8sbased.sh -source $COMMON_DIR/env.sh -source $K8S_DIR/env.sh +source "$COMMON_DIR"/deploy.sh +source "$COMMON_DIR"/k8sbased.sh +source "$COMMON_DIR"/env.sh +source "$K8S_DIR"/env.sh if [[ -z $CLUSTER ]]; then - read -p "Enter cluster name to create: " CLUSTER + read -p -r "Enter cluster name to create: " CLUSTER fi echo "CLUSTER set to $CLUSTER" @@ -18,7 +19,9 @@ if [[ -z "${ROX_ADMIN_PASSWORD}" ]]; then export ROX_ADMIN_PASSWORD="${ROX_PASSWORD:-}" fi if [[ -z "$ROX_ADMIN_PASSWORD" && -f "${K8S_DIR}/central-deploy/password" ]]; then - export ROX_ADMIN_PASSWORD="$(cat ${K8S_DIR}/central-deploy/password)" + # shellcheck disable=SC2086 + ROX_ADMIN_PASSWORD="$(cat ${K8S_DIR}/central-deploy/password)" + export ROX_ADMIN_PASSWORD fi launch_sensor "$K8S_DIR" diff --git a/deploy/openshift/central.sh b/deploy/openshift/central.sh index a7f187191c092..8c4f57d868ac5 100755 --- a/deploy/openshift/central.sh +++ b/deploy/openshift/central.sh @@ -1,12 +1,13 @@ #!/usr/bin/env bash +# shellcheck disable=SC1091 set -e K8S_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" COMMON_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../common && pwd)" -source $COMMON_DIR/env.sh -source $COMMON_DIR/deploy.sh -source $COMMON_DIR/k8sbased.sh -source $K8S_DIR/env.sh +source "$COMMON_DIR"/env.sh +source "$COMMON_DIR"/deploy.sh +source "$COMMON_DIR"/k8sbased.sh +source "$K8S_DIR"/env.sh launch_central "$K8S_DIR" diff --git a/scripts/style/shellcheck_skip.txt b/scripts/style/shellcheck_skip.txt index 43c39a6b09dac..a6a9a4c2e6ac3 100644 --- a/scripts/style/shellcheck_skip.txt +++ b/scripts/style/shellcheck_skip.txt @@ -2,14 +2,10 @@ deploy/common/deploy.sh deploy/common/docker-auth.sh deploy/common/k8sbased.sh -deploy/k8s/central.sh deploy/k8s/deploy-local.sh deploy/k8s/deploy.sh -deploy/k8s/sensor.sh -deploy/openshift/central.sh deploy/openshift/deploy-local.sh deploy/openshift/deploy.sh -deploy/openshift/sensor.sh dev-tools/add-host-alias.sh dev-tools/enable-hotreload.sh dev-tools/roxctl.sh