reorder like faustin reviewed, and shellcheck pass

MariaDB · May 17, 2024 · 012f09c · 012f09c
1 parent 9d9bf3e
commit 012f09c
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 33 deletions.
diff --git a/10.11/docker-entrypoint.sh b/10.11/docker-entrypoint.sh
@@ -232,10 +232,10 @@ docker_init_database_dir() {
 	local mariadbdArgs=()
 	for arg in "${@:2}"; do
 		# Check if the argument contains whitespace
-		if [[ ! "$arg" =~ [[:space:]] ]]; then
-			mariadbdArgs+=("$arg")
+		if [[ "$arg" =~ [[:space:]] ]]; then
+			mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace."
 		else
-			mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace.
+			mariadbdArgs+=("$arg")
 		fi
 	done
 	mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \

diff --git a/10.4/docker-entrypoint.sh b/10.4/docker-entrypoint.sh
@@ -224,10 +224,10 @@ docker_init_database_dir() {
 	local mariadbdArgs=()
 	for arg in "${@:2}"; do
 		# Check if the argument contains whitespace
-		if [[ ! "$arg" =~ [[:space:]] ]]; then
-			mariadbdArgs+=("$arg")
+		if [[ "$arg" =~ [[:space:]] ]]; then
+			mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace."
 		else
-			mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace.
+			mariadbdArgs+=("$arg")
 		fi
 	done
 	mysql_install_db "${installArgs[@]}" "${mariadbdArgs[@]}" \

diff --git a/10.5/docker-entrypoint.sh b/10.5/docker-entrypoint.sh
@@ -224,10 +224,10 @@ docker_init_database_dir() {
 	local mariadbdArgs=()
 	for arg in "${@:2}"; do
 		# Check if the argument contains whitespace
-		if [[ ! "$arg" =~ [[:space:]] ]]; then
-			mariadbdArgs+=("$arg")
+		if [[ "$arg" =~ [[:space:]] ]]; then
+			mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace."
 		else
-			mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace.
+			mariadbdArgs+=("$arg")
 		fi
 	done
 	mysql_install_db "${installArgs[@]}" "${mariadbdArgs[@]}" \

diff --git a/10.6/docker-entrypoint.sh b/10.6/docker-entrypoint.sh
@@ -224,10 +224,10 @@ docker_init_database_dir() {
 	local mariadbdArgs=()
 	for arg in "${@:2}"; do
 		# Check if the argument contains whitespace
-		if [[ ! "$arg" =~ [[:space:]] ]]; then
-			mariadbdArgs+=("$arg")
+		if [[ "$arg" =~ [[:space:]] ]]; then
+			mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace."
 		else
-			mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace.
+			mariadbdArgs+=("$arg")
 		fi
 	done
 	mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \

diff --git a/11.0/docker-entrypoint.sh b/11.0/docker-entrypoint.sh
@@ -232,10 +232,10 @@ docker_init_database_dir() {
 	local mariadbdArgs=()
 	for arg in "${@:2}"; do
 		# Check if the argument contains whitespace
-		if [[ ! "$arg" =~ [[:space:]] ]]; then
-			mariadbdArgs+=("$arg")
+		if [[ "$arg" =~ [[:space:]] ]]; then
+			mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace."
 		else
-			mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace.
+			mariadbdArgs+=("$arg")
 		fi
 	done
 	mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \

diff --git a/11.1/docker-entrypoint.sh b/11.1/docker-entrypoint.sh
@@ -232,10 +232,10 @@ docker_init_database_dir() {
 	local mariadbdArgs=()
 	for arg in "${@:2}"; do
 		# Check if the argument contains whitespace
-		if [[ ! "$arg" =~ [[:space:]] ]]; then
-			mariadbdArgs+=("$arg")
+		if [[ "$arg" =~ [[:space:]] ]]; then
+			mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace."
 		else
-			mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace.
+			mariadbdArgs+=("$arg")
 		fi
 	done
 	mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \

diff --git a/11.2/docker-entrypoint.sh b/11.2/docker-entrypoint.sh
@@ -232,10 +232,10 @@ docker_init_database_dir() {
 	local mariadbdArgs=()
 	for arg in "${@:2}"; do
 		# Check if the argument contains whitespace
-		if [[ ! "$arg" =~ [[:space:]] ]]; then
-			mariadbdArgs+=("$arg")
+		if [[ "$arg" =~ [[:space:]] ]]; then
+			mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace."
 		else
-			mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace.
+			mariadbdArgs+=("$arg")
 		fi
 	done
 	mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \

diff --git a/11.3/docker-entrypoint.sh b/11.3/docker-entrypoint.sh
@@ -232,10 +232,10 @@ docker_init_database_dir() {
 	local mariadbdArgs=()
 	for arg in "${@:2}"; do
 		# Check if the argument contains whitespace
-		if [[ ! "$arg" =~ [[:space:]] ]]; then
-			mariadbdArgs+=("$arg")
+		if [[ "$arg" =~ [[:space:]] ]]; then
+			mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace."
 		else
-			mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace.
+			mariadbdArgs+=("$arg")
 		fi
 	done
 	mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \

diff --git a/11.4/docker-entrypoint.sh b/11.4/docker-entrypoint.sh
@@ -232,10 +232,10 @@ docker_init_database_dir() {
 	local mariadbdArgs=()
 	for arg in "${@:2}"; do
 		# Check if the argument contains whitespace
-		if [[ ! "$arg" =~ [[:space:]] ]]; then
-			mariadbdArgs+=("$arg")
+		if [[ "$arg" =~ [[:space:]] ]]; then
+			mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace."
 		else
-			mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace.
+			mariadbdArgs+=("$arg")
 		fi
 	done
 	mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \

diff --git a/11.5/docker-entrypoint.sh b/11.5/docker-entrypoint.sh
@@ -232,10 +232,10 @@ docker_init_database_dir() {
 	local mariadbdArgs=()
 	for arg in "${@:2}"; do
 		# Check if the argument contains whitespace
-		if [[ ! "$arg" =~ [[:space:]] ]]; then
-			mariadbdArgs+=("$arg")
+		if [[ "$arg" =~ [[:space:]] ]]; then
+			mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace."
 		else
-			mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace.
+			mariadbdArgs+=("$arg")
 		fi
 	done
 	mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -232,10 +232,10 @@ docker_init_database_dir() {
 	local mariadbdArgs=()
 	for arg in "${@:2}"; do
 		# Check if the argument contains whitespace
-		if [[ ! "$arg" =~ [[:space:]] ]]; then
-			mariadbdArgs+=("$arg")
+		if [[ "$arg" =~ [[:space:]] ]]; then
+			mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace."
 		else
-			mysql_warn Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace.
+			mariadbdArgs+=("$arg")
 		fi
 	done
 	mysql_install_db "${installArgs[@]}" "${mariadbdArgs[@]}" \