X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fportal%2Fcomponents%2Fportal-mariadb%2Fresources%2Fconfig%2Fmariadb%2Fdocker-entrypoint.sh;h=0247ad61257f90bcd90c6d5bd517b1866b4a2427;hb=a8f89adf23312cd9207f01ebdace6ea99a9e35d7;hp=3d5e13ff5aa8cb1b1d2aa2b9034b77455b8377cb;hpb=68dd3ba1c943661a3d49d117883cc3073f4829fc;p=oom.git

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 3d5e13ff5a..0247ad6125 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
@@ -164,7 +164,7 @@ docker_init_database_dir() {
 		installArgs=${installArgs}" --auth-root-authentication-method=normal"
 	fi
 	# "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here)
-	mysql_install_db ${installArgs} "${@:2}"
+	mysql_install_db ${installArgs} "$(echo ${@} | sed 's/^ *[^ ]* *//')"
 	mysql_note "Database files initialized"
 }
 
@@ -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
 }
 
@@ -313,7 +313,7 @@ _mysql_want_help() {
 
 _main() {
 	# if command starts with an option, prepend mysqld
-	if [ "${1:0:1}" = '-' ]; then
+	if echo "$1" | grep '^-' >/dev/null; then
 		set -- mysqld "$@"
 	fi