Skip to content

Commit bfe33f5

Browse files
committed
fix helm_versionstring issue and remove unneeded comments
1 parent eb8047e commit bfe33f5

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

bin/helm-include.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ function helm2ReleaseCheck {
6161
log_error "A Helm 2.x release of [$release] already exists"
6262
log_error "Helm [$HELM_VER_FULL] cannot manage the Helm 2.x release of [$release]"
6363
exit 1
64-
fi
64+
fi
6565
fi
6666
}
6767

@@ -72,7 +72,7 @@ function helmRepoAdd {
7272
## If this is an air gap deployment, do nothing
7373
if [ "$AIRGAP_DEPLOYMENT" == "true" ]; then
7474
return 0
75-
fi
75+
fi
7676

7777
HELM_FORCE_REPO_UPDATE=${HELM_FORCE_REPO_UPDATE:-true}
7878
if [[ ! $(helm repo list 2>/dev/null) =~ $repo[[:space:]] ]]; then
@@ -128,7 +128,8 @@ function get_helm_versionstring {
128128
if [ "$V4M_HELM_USE_LATEST" == "true" ]; then
129129
: # return null string
130130
else
131-
echo "--version $1"
131+
# Explicitly use printf instead of echo to avoid quote issues
132+
printf -- "--version %s" "$1"
132133
fi
133134

134135
return

logging/bin/deploy_fluentbit_azmonitor.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
# Copyright © 2020, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
44
# SPDX-License-Identifier: Apache-2.0
55

6-
# shellcheck source=/dev/null
76
cd "$(dirname "$BASH_SOURCE")/../.." || exit 1
8-
# shellcheck source=/dev/null
97
source logging/bin/common.sh
108

119
# Fix SC2155: Declare and assign separately

logging/bin/deploy_fluentbit_k8sevents_opensearch.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
# SPDX-License-Identifier: Apache-2.0
55

66
cd "$(dirname "$BASH_SOURCE")/../.." || exit 1
7-
# shellcheck source=logging/bin/common.sh
87
source logging/bin/common.sh
9-
# shellcheck source=logging/bin/secrets-include.sh
108
source logging/bin/secrets-include.sh
119

1210
this_script=$(basename "$0")

0 commit comments

Comments
 (0)