From: Guillaume Lambert <guillaume.lambert@orange.com>
Date: Thu, 11 Mar 2021 20:53:21 +0000 (+0100)
Subject: [COMMON] Fix read -s, echo -e and $'...' bashisms
X-Git-Tag: 9.0.0~188^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=commitdiff_plain;h=bd60082c573ba7b741beec6a9844fd5ecb9a0d53

[COMMON] Fix read -s, echo -e and $'...' bashisms

pointed out by checkbashisms.

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

diff --git a/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh b/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
index 68b50e1ad6..97df772ba7 100755
--- a/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
+++ b/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
@@ -70,7 +70,8 @@ do
   printf "."
   sleep 1
 done
-echo -e "\nmariadbgalera ready"
+echo
+echo "mariadbgalera ready"
 
 if [ ! -d ${DBINIT_DIR} ]
 then
diff --git a/kubernetes/contrib/tools/check-for-staging-images.sh b/kubernetes/contrib/tools/check-for-staging-images.sh
index 8c01312fa2..543e918cfa 100755
--- a/kubernetes/contrib/tools/check-for-staging-images.sh
+++ b/kubernetes/contrib/tools/check-for-staging-images.sh
@@ -40,7 +40,7 @@ printf "\n"
 if [ -n "$NOT_AVAILABLE_IMAGES" ]; then
     echo "[ERROR] Only release images are allowed in helm charts."
     echo "[ERROR] Images not found in release repo:"
-    echo -e "$NOT_AVAILABLE_IMAGES"
+    printf "%b$NOT_AVAILABLE_IMAGES\n"
     exit 1
 fi
-exit 0
\ No newline at end of file
+exit 0
diff --git a/kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh b/kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh
index 40341bec11..3d5e13ff5a 100644
--- a/kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh
+++ b/kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh
@@ -87,7 +87,7 @@ docker_process_init_files() {
 mysql_check_config() {
 	local toRun=( "$@" --verbose --help --log-bin-index="$(mktemp -u)" ) errors
 	if ! errors="$("${toRun[@]}" 2>&1 >/dev/null)"; then
-		mysql_error $'mysqld failed while attempting to check config\n\tcommand was: '"${toRun[*]}"$'\n\t'"$errors"
+		mysql_error "$(printf 'mysqld failed while attempting to check config\n\tcommand was: ')${toRun[*]}$(printf'\n\t')$errors"
 	fi
 }
 
@@ -134,7 +134,7 @@ docker_temp_server_stop() {
 # Verify that the minimally required password settings are set for new databases.
 docker_verify_minimum_env() {
 	if [ -z "$MYSQL_ROOT_PASSWORD" -a -z "$MYSQL_ALLOW_EMPTY_PASSWORD" -a -z "$MYSQL_RANDOM_ROOT_PASSWORD" ]; then
-		mysql_error $'Database is uninitialized and password option is not specified\n\tYou need to specify one of MYSQL_ROOT_PASSWORD, MYSQL_ALLOW_EMPTY_PASSWORD and MYSQL_RANDOM_ROOT_PASSWORD'
+		mysql_error "$(printf'Database is uninitialized and password option is not specified\n\tYou need to specify one of MYSQL_ROOT_PASSWORD, MYSQL_ALLOW_EMPTY_PASSWORD and MYSQL_RANDOM_ROOT_PASSWORD')"
 	fi
 }
 
diff --git a/kubernetes/robot/demo-k8s.sh b/kubernetes/robot/demo-k8s.sh
index 5e4e216c95..0d30557220 100755
--- a/kubernetes/robot/demo-k8s.sh
+++ b/kubernetes/robot/demo-k8s.sh
@@ -93,7 +93,10 @@ do
 	case $key in
     	init_robot)
 			TAG="UpdateWebPage"
-			read -s -p "WEB Site Password for user 'test': " WEB_PASSWORD
+			echo "WEB Site Password for user 'test': "
+			stty -echo
+			read WEB_PASSWORD
+			stty echo
 			if [ "$WEB_PASSWORD" = "" ]; then
 				echo ""
 				echo "WEB Password is required for user 'test'"