From: Krzysztof Opasiak <k.opasiak@samsung.com>
Date: Wed, 8 Sep 2021 09:39:08 +0000 (+0000)
Subject: Merge "[COMMON] Fix ${p//pat/str} bashism"
X-Git-Tag: 9.0.0~142
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=bbdbda860f17381d7da042056d4a30fe3cd8844c;hp=-c;p=oom.git

Merge "[COMMON] Fix ${p//pat/str} bashism"
---

bbdbda860f17381d7da042056d4a30fe3cd8844c
diff --combined kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh
index b07d127ff8,0247ad6125..f5dcbff6bf
--- a/kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh
+++ b/kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh
@@@ -106,7 -106,7 +106,7 @@@ docker_temp_server_start() 
  	"$@" --skip-networking --socket="${SOCKET}" &
  	mysql_note "Waiting for server startup"
  	local i
 -	for i in {30..0}; do
 +	for i in $(seq 30 -1 0); do
  		# only use the root password if the database has already been initializaed
  		# so that it won't try to fill in a password file when it hasn't been set yet
  		extraArgs=""
@@@ -278,10 -278,10 +278,10 @@@ docker_setup_db() 
  
  		if [ -n "$MYSQL_DATABASE" ]; then
  			mysql_note "Giving user ${MYSQL_USER} access to schema ${MYSQL_DATABASE}"
- 			echo "GRANT ALL ON \`${MYSQL_DATABASE//_/\\_}\`.* TO '$MYSQL_USER'@'%' ;" |docker_process_sql --database=mysql
+ 			echo "GRANT ALL ON \`$(echo $MYSQL_DATABASE | sed 's@_@\\_@g')\`.* TO '$MYSQL_USER'@'%' ;" | docker_process_sql --database=mysql
  		fi
  
- 		echo "FLUSH PRIVILEGES ;" |docker_process_sql --database=mysql
+ 		echo "FLUSH PRIVILEGES ;" | docker_process_sql --database=mysql
  	fi
  }