Merge 2a7d6d8937 into 3adaf30839

fix: move glob change outside the loop
Signed-off-by: Josh <josh.t.richards@gmail.com>
2025-04-20 02:46:10 +02:00 · 2025-03-30 21:19:18 -05:00 · 2024-11-26 17:01:14 -05:00 · 2024-11-26 14:48:09 -05:00
1 changed files with 5 additions and 3 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
Author	SHA1	Message	Date
Josh	567b0a43b7	Merge `2a7d6d8937` into `3adaf30839`	2025-03-30 21:19:18 -05: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