Skip to content

Fix: Shell scripts to pass shellcheck linter for sensor.sh and central.sh #3578

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
janisz merged 19 commits into from
Oct 28, 2022
Merged

Fix: Shell scripts to pass shellcheck linter for sensor.sh and central.sh #3578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
d93210e
Fix: Shell scripts to pass shellcheck linter for sensor and central f…
rachana-sudhindradani Oct 26, 2022
5ac7507
Remove files from shellcheck_skip.txt
rachana-sudhindradani Oct 26, 2022
221b96c
Merge branch 'stackrox:master' into master
rachana-dani Oct 26, 2022
939fef1
Create central.sh
rachana-dani Oct 27, 2022
9d8420c
Update sensor.sh
rachana-dani Oct 27, 2022
0b0f0ab
Update sensor.sh
rachana-dani Oct 27, 2022
4c02dec
Update sensor.sh
rachana-dani Oct 27, 2022
d5db2f4
Remove -r flag
rachana-sudhindradani Oct 27, 2022
6818e03
Add and move suppress comments
rachana-sudhindradani Oct 27, 2022
4702da8
Add and move suppress comments
rachana-sudhindradani Oct 27, 2022
113770c
Update central.sh
rachana-dani Oct 27, 2022
b14a260
Update shellcheck_skip.txt
rachana-dani Oct 27, 2022
956ca8c
Add suppress comments
rachana-sudhindradani Oct 27, 2022
f3292e0
Merge remote-tracking branch 'origin/master'
rachana-sudhindradani Oct 27, 2022
d46ee71
Add touched files back
rachana-sudhindradani Oct 27, 2022
fa61ae6
Remove touched files back from shellcheck_skip.txt
rachana-sudhindradani Oct 27, 2022
44c2d4d
Update shellcheck comment, add double quotes
rachana-sudhindradani Oct 28, 2022
2202929
Update shellcheck comment,
rachana-sudhindradani Oct 28, 2022
4777193
Update scripts/style/shellcheck_skip.txt
janisz Oct 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions deploy/k8s/central.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
15 changes: 9 additions & 6 deletions deploy/k8s/sensor.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,27 @@
#!/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"

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"
9 changes: 5 additions & 4 deletions deploy/openshift/central.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
4 changes: 0 additions & 4 deletions scripts/style/shellcheck_skip.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down