diff --git a/root/etc/cont-init.d/40-config b/root/etc/cont-init.d/40-config index 33412ef..07560dc 100644 --- a/root/etc/cont-init.d/40-config +++ b/root/etc/cont-init.d/40-config @@ -1,12 +1,12 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash # create folders mkdir -p \ /config/cache # clear previous config -for f in /app/www/public/config_local.*.php -do +for f in /app/www/public/config_local.*.php; do if [ -f "$f" ]; then rm "$f" fi @@ -18,9 +18,8 @@ if [[ ! -e /config/config_local.php ]]; then fi # copy extra user-profiles -for f in /config/config_local*.php -do -cp "$f" /app/www/public/ +for f in /config/config_local*.php; do + cp "$f" /app/www/public/ done # permissions diff --git a/root/migrations/02-default-location b/root/migrations/02-default-location index 8a66d0c..23c0ae3 100644 --- a/root/migrations/02-default-location +++ b/root/migrations/02-default-location @@ -1,10 +1,11 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash DEFAULT_CONF="/config/nginx/site-confs/default.conf" OLD_ROOT="root\s*/var/www/localhost/cops;" NEW_ROOT="root /app/www/public;" -if grep -q "${OLD_ROOT}" "${DEFAULT_CONF}";then +if grep -q "${OLD_ROOT}" "${DEFAULT_CONF}"; then echo "updating root in ${DEFAULT_CONF}" sed -i "s|${OLD_ROOT}|${NEW_ROOT}|" "${DEFAULT_CONF}" fi