From: Guillaume Lambert <guillaume.lambert@orange.com>
Date: Fri, 12 Mar 2021 09:59:34 +0000 (+0100)
Subject: [COMMON] Fix ${p^^} bashisms
X-Git-Tag: 9.0.0~158^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=commitdiff_plain;h=05c791d5db91bef0cc62ec4393e3ceca5bff4755

[COMMON] Fix ${p^^} bashisms

pointed out by checkbashisms

Issue-ID: OOM-2643
Signed-off-by: Guillaume Lambert <guillaume.lambert@orange.com>
Change-Id: I34d828ac4ab27b5ce6547a20aecc610cdcecf00e
---

diff --git a/kubernetes/common/cassandra/resources/config/docker-entrypoint.sh b/kubernetes/common/cassandra/resources/config/docker-entrypoint.sh
index c01d7c6d57..2d30f2e068 100644
--- a/kubernetes/common/cassandra/resources/config/docker-entrypoint.sh
+++ b/kubernetes/common/cassandra/resources/config/docker-entrypoint.sh
@@ -71,7 +71,7 @@ if [ "$1" = 'cassandra' ]; then
                 start_rpc \
                 authenticator \
         ; do
-                var="CASSANDRA_${yaml^^}"
+                var="CASSANDRA_$(echo $yaml | tr '[:lower:]' '[:upper:]')"
                 # eval presents no security issue here because of limited possible values of var
                 eval val=\$$var
                 if [ "$val" ]; then
@@ -81,7 +81,7 @@ if [ "$1" = 'cassandra' ]; then
         done
 
         for rackdc in dc rack; do
-                var="CASSANDRA_${rackdc^^}"
+                var="CASSANDRA_$(echo $rackdc | tr '[:lower:]' '[:upper:]')"
                 # eval presents no security issue here because of limited possible values of var
                 eval val=\$$var
                 if [ "$val" ]; then
diff --git a/kubernetes/common/mariadb-init/resources/config/db_init.sh b/kubernetes/common/mariadb-init/resources/config/db_init.sh
index f130bb5118..df7c336405 100755
--- a/kubernetes/common/mariadb-init/resources/config/db_init.sh
+++ b/kubernetes/common/mariadb-init/resources/config/db_init.sh
@@ -21,8 +21,8 @@
 set -e
 
 while read DB ; do
-    USER_VAR="MYSQL_USER_${DB^^}"
-    PASS_VAR="MYSQL_PASSWORD_${DB^^}"
+    USER_VAR="MYSQL_USER_$(echo $DB | tr '[:lower:]' '[:upper:]')"
+    PASS_VAR="MYSQL_PASSWORD_$(echo $DB | tr '[:lower:]' '[:upper:]')"
 {{/*
     # USER=${!USER_VAR}
     # PASS=`echo -n ${!PASS_VAR} | sed -e "s/'/''/g"`