diff options
author | Guillaume Lambert <guillaume.lambert@orange.com> | 2021-03-12 13:53:18 +0100 |
---|---|---|
committer | Guillaume Lambert <guillaume.lambert@orange.com> | 2021-09-22 09:17:18 +0000 |
commit | 85b1492555d765b14864e0d2d59db7a50cdccaf0 (patch) | |
tree | aea3a348a63c939b1c4dfa4f1bc1162ebbd9df0c /kubernetes/contrib | |
parent | b62b9cf9e7e5248972baa619c6d015459187cd64 (diff) |
[COMMON] Enforce checkbashisms tox profile
- add checkbahims to tox.ini default profiles
- remove -f options to unforce bashisms detection in explicit bash
scripts and to differentiate treatments between bash and sh
- migrate #!/bin/bash shebangs to #!/bin/sh for scripts without bashisms
The following scripts have not been migrated since they still use
bashisms difficult to migrate (mostly arrays - more details below)
./kubernetes/common/mariadb-init/resources/config/db_init.sh
./kubernetes/portal/components/portal-mariadb/resources/config/ \
mariadb/docker-entrypoint.sh
./kubernetes/helm/plugins/deploy/deploy.sh
./kubernetes/helm/plugins/undeploy/undeploy.sh
./kubernetes/sdnc/components/sdnc-prom/resources/bin/ensureSdncActive.sh
$ find . -not -path '*/\.*' -name *.sh -exec checkbashisms -f {} + 2>&1\
| grep line | cut -d' ' -f 7- | sort | uniq -c | sort -k1,1nr
18 (bash arrays, ${name[0|*|@]}):
2 (declare):
1 ($FUNCNAME):
1 (shopt):
1 (trap with ERR|DEBUG|RETURN):
https://mywiki.wooledge.org/Bashism#Arrays
https://mywiki.wooledge.org/Bashism#Special_Variables
https://mywiki.wooledge.org/Bashism#Builtins
https://www.oilshell.org/release/0.5.alpha2/test/spec.wwz/builtin-trap.html
Issue-ID: OOM-2643
Signed-off-by: Guillaume Lambert <guillaume.lambert@orange.com>
Change-Id: Id06ad1d45004321a293bdd26038d8da5f7b6b4ac
Diffstat (limited to 'kubernetes/contrib')
5 files changed, 11 insertions, 7 deletions
diff --git a/kubernetes/contrib/components/ejbca/resources/ejbca-config.sh b/kubernetes/contrib/components/ejbca/resources/ejbca-config.sh index 2c672e2f07..94c95d6c30 100755 --- a/kubernetes/contrib/components/ejbca/resources/ejbca-config.sh +++ b/kubernetes/contrib/components/ejbca/resources/ejbca-config.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh waitForEjbcaToStart() { until $(curl -kI https://localhost:8443/ejbca/publicweb/healthcheck/ejbcahealth --output /dev/null --silent --head --fail) diff --git a/kubernetes/contrib/dns-server-for-vhost-ingress-testing/deploy_dns.sh b/kubernetes/contrib/dns-server-for-vhost-ingress-testing/deploy_dns.sh index 7e9077d972..3c66feeb46 100755 --- a/kubernetes/contrib/dns-server-for-vhost-ingress-testing/deploy_dns.sh +++ b/kubernetes/contrib/dns-server-for-vhost-ingress-testing/deploy_dns.sh @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/sh -e # Copyright 2020 Samsung Electronics Co., Ltd. # @@ -33,7 +33,8 @@ $0 --info Display howto configure target machine } -target_machine_notice_info() { +target_machine_notice_info() +{ cat << ==infodeploy Extra DNS server already deployed: 1. You can add the DNS server to the target machine using following commands: diff --git a/kubernetes/contrib/metallb-loadbalancer-inst/install-metallb-on-cluster.sh b/kubernetes/contrib/metallb-loadbalancer-inst/install-metallb-on-cluster.sh index ce5a19ba25..c62e2a51bd 100755 --- a/kubernetes/contrib/metallb-loadbalancer-inst/install-metallb-on-cluster.sh +++ b/kubernetes/contrib/metallb-loadbalancer-inst/install-metallb-on-cluster.sh @@ -1,4 +1,5 @@ -#!/bin/bash -e +#!/bin/sh -e + # # Copyright 2020 Samsung Electronics Co., Ltd. # @@ -15,7 +16,8 @@ # limitations under the License. # -usage() { +usage() +{ cat << ==usage $0 Automatic configuration using external addresess from nodes $0 --help This message diff --git a/kubernetes/contrib/tools/check-for-staging-images.sh b/kubernetes/contrib/tools/check-for-staging-images.sh index 543e918cfa..9705ee6ea8 100755 --- a/kubernetes/contrib/tools/check-for-staging-images.sh +++ b/kubernetes/contrib/tools/check-for-staging-images.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Copyright © 2020 Samsung Electronics # diff --git a/kubernetes/contrib/tools/rke/rke_setup.sh b/kubernetes/contrib/tools/rke/rke_setup.sh index 2ee123b36a..a8938a96ee 100755 --- a/kubernetes/contrib/tools/rke/rke_setup.sh +++ b/kubernetes/contrib/tools/rke/rke_setup.sh @@ -1,4 +1,5 @@ -#!/bin/bash +#!/bin/sh + ############################################################################# # Copyright © 2019 Bell. # |