Merge 2a7d6d8937 into abd0ba3fdb

Bump stable to 30.0.9
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
2025-04-18 18:06:09 +02:00 · 2025-04-14 13:12:47 +02:00 · 2025-04-11 20:27:01 +00:00 · 2024-11-26 17:01:14 -05:00 · 2024-11-26 14:48:09 -05:00
2 changed files with 6 additions and 4 deletions
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@ -237,12 +237,14 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                        fi
                        if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
                            echo "Setting trusted domains…"
+			    set -f # turn off glob
                            NC_TRUSTED_DOMAIN_IDX=1
-                            for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
-                                DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
-                                run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
+                            for DOMAIN in ${NEXTCLOUD_TRUSTED_DOMAINS}; do
+                                DOMAIN=$(echo "${DOMAIN}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+                                run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=\"${DOMAIN}\""
                                NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
                            done
+			    set +f # turn glob back on
                        fi

                        run_path post-installation
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail

-stable_channel='30.0.8'
+stable_channel='30.0.9'

 self="$(basename "$BASH_SOURCE")"
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
Author	SHA1	Message	Date
Josh	393411b10b	Merge `2a7d6d8937` into `abd0ba3fdb`	2025-04-14 13:12:47 +02:00
J0WI	abd0ba3fdb	Bump stable to 30.0.9 Signed-off-by: J0WI <J0WI@users.noreply.github.com>	2025-04-11 20:27:01 +00:00
Josh	2a7d6d8937	fix: move glob change outside the loop Signed-off-by: Josh <josh.t.richards@gmail.com>	2024-11-26 17:01:14 -05:00
Josh	db577ce536	fix: prevent glob expansion on wildcard trusted_domains Signed-off-by: Josh <josh.t.richards@gmail.com>	2024-11-26 14:48:09 -05:00