From d10d76a9ea83ecbb759ff469cf46c8290befc509 Mon Sep 17 00:00:00 2001
From: Andrea Milazzo <andreamilazzo@mancausoft.org>
Date: Wed, 25 May 2022 12:29:01 +0200
Subject: [PATCH] Fix KEYCLOAK_EXTRA_ARGS enviroment on run script (#66)

* Fix KEYCLOAK_EXTRA_ARGS enviroment on run script

Signed-off-by: Andrea Milazzo <andreamilazzo@mancausoft.org>
Signed-off-by: Andrea Milazzo <andrea@cledar.pl>

* Clean fix for KEYCLOAK_EXTRA_ARGS enviroment

Signed-off-by: Andrea Milazzo <andrea@cledar.pl>
---
 .../17/debian-10/rootfs/opt/bitnami/scripts/keycloak/run.sh | 6 +++---
 .../18/debian-10/rootfs/opt/bitnami/scripts/keycloak/run.sh | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bitnami/keycloak/17/debian-10/rootfs/opt/bitnami/scripts/keycloak/run.sh b/bitnami/keycloak/17/debian-10/rootfs/opt/bitnami/scripts/keycloak/run.sh
index 91c48e164f0a..a50338e191d5 100755
--- a/bitnami/keycloak/17/debian-10/rootfs/opt/bitnami/scripts/keycloak/run.sh
+++ b/bitnami/keycloak/17/debian-10/rootfs/opt/bitnami/scripts/keycloak/run.sh
@@ -21,7 +21,7 @@ conf_file="${KEYCLOAK_CONF_DIR}/${KEYCLOAK_CONF_FILE}"
 
 is_boolean_yes "$KEYCLOAK_PRODUCTION" && start_param="start" || start_param="start-dev"
 
-start_command=("${KEYCLOAK_BIN_DIR}/kc.sh -cf ${conf_file} ${start_param}")
+start_command=("${KEYCLOAK_BIN_DIR}/kc.sh" "-cf" "$conf_file" "$start_param")
 
 # Add extra args
 if [[ -n "$KEYCLOAK_EXTRA_ARGS" ]]; then
@@ -30,7 +30,7 @@ if [[ -n "$KEYCLOAK_EXTRA_ARGS" ]]; then
 fi
 
 if am_i_root; then
-    exec gosu "$KEYCLOAK_DAEMON_USER" /bin/bash -c "${start_command[@]}"
+    exec gosu "$KEYCLOAK_DAEMON_USER" /bin/bash -c "${start_command[*]}"
 else
-    exec /bin/bash -c "${start_command[@]}"
+    exec /bin/bash -c "${start_command[*]}"
 fi
diff --git a/bitnami/keycloak/18/debian-10/rootfs/opt/bitnami/scripts/keycloak/run.sh b/bitnami/keycloak/18/debian-10/rootfs/opt/bitnami/scripts/keycloak/run.sh
index 91c48e164f0a..a50338e191d5 100755
--- a/bitnami/keycloak/18/debian-10/rootfs/opt/bitnami/scripts/keycloak/run.sh
+++ b/bitnami/keycloak/18/debian-10/rootfs/opt/bitnami/scripts/keycloak/run.sh
@@ -21,7 +21,7 @@ conf_file="${KEYCLOAK_CONF_DIR}/${KEYCLOAK_CONF_FILE}"
 
 is_boolean_yes "$KEYCLOAK_PRODUCTION" && start_param="start" || start_param="start-dev"
 
-start_command=("${KEYCLOAK_BIN_DIR}/kc.sh -cf ${conf_file} ${start_param}")
+start_command=("${KEYCLOAK_BIN_DIR}/kc.sh" "-cf" "$conf_file" "$start_param")
 
 # Add extra args
 if [[ -n "$KEYCLOAK_EXTRA_ARGS" ]]; then
@@ -30,7 +30,7 @@ if [[ -n "$KEYCLOAK_EXTRA_ARGS" ]]; then
 fi
 
 if am_i_root; then
-    exec gosu "$KEYCLOAK_DAEMON_USER" /bin/bash -c "${start_command[@]}"
+    exec gosu "$KEYCLOAK_DAEMON_USER" /bin/bash -c "${start_command[*]}"
 else
-    exec /bin/bash -c "${start_command[@]}"
+    exec /bin/bash -c "${start_command[*]}"
 fi