From df18860bfe14ab26c8b32c972f9f8e28db9733ba Mon Sep 17 00:00:00 2001 From: Ricardo Amaro Date: Tue, 5 Nov 2024 08:45:18 +0000 Subject: [PATCH] [bitnami/drupal] Fix problem in getting database port on second run in libdrupal.sh (#73235) * Fix problem in getting port in libdrupal.sh Signed-off-by: Ricardo Amaro * Fix also in Drupal 11 Signed-off-by: Ricardo Amaro --------- Signed-off-by: Ricardo Amaro --- .../drupal/10/debian-12/rootfs/opt/bitnami/scripts/libdrupal.sh | 2 +- .../drupal/11/debian-12/rootfs/opt/bitnami/scripts/libdrupal.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bitnami/drupal/10/debian-12/rootfs/opt/bitnami/scripts/libdrupal.sh b/bitnami/drupal/10/debian-12/rootfs/opt/bitnami/scripts/libdrupal.sh index 9ea5e08ec7ce..9efbf2f8d407 100644 --- a/bitnami/drupal/10/debian-12/rootfs/opt/bitnami/scripts/libdrupal.sh +++ b/bitnami/drupal/10/debian-12/rootfs/opt/bitnami/scripts/libdrupal.sh @@ -203,7 +203,7 @@ drupal_initialize() { drupal_database_conf_get() { local -r key="${1:?key missing}" debug "Getting ${key} from Drupal database configuration" - grep -E "^\s*'${key}' =>" "$DRUPAL_CONF_FILE" | grep -E -o "=> '.*'" | cut -f2 -d\' + grep -E "^\s*'${key}' =>" "$DRUPAL_CONF_FILE" | awk -F'=>' '{gsub(/[ ,'\''"]/, "", $2); print $2}' } ######################## diff --git a/bitnami/drupal/11/debian-12/rootfs/opt/bitnami/scripts/libdrupal.sh b/bitnami/drupal/11/debian-12/rootfs/opt/bitnami/scripts/libdrupal.sh index 9ea5e08ec7ce..9efbf2f8d407 100644 --- a/bitnami/drupal/11/debian-12/rootfs/opt/bitnami/scripts/libdrupal.sh +++ b/bitnami/drupal/11/debian-12/rootfs/opt/bitnami/scripts/libdrupal.sh @@ -203,7 +203,7 @@ drupal_initialize() { drupal_database_conf_get() { local -r key="${1:?key missing}" debug "Getting ${key} from Drupal database configuration" - grep -E "^\s*'${key}' =>" "$DRUPAL_CONF_FILE" | grep -E -o "=> '.*'" | cut -f2 -d\' + grep -E "^\s*'${key}' =>" "$DRUPAL_CONF_FILE" | awk -F'=>' '{gsub(/[ ,'\''"]/, "", $2); print $2}' } ########################