diff --git a/root/etc/cont-init.d/40-install b/root/etc/cont-init.d/40-install index 230a387..ac4f620 100644 --- a/root/etc/cont-init.d/40-install +++ b/root/etc/cont-init.d/40-install @@ -1,16 +1,17 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash # make our folders mkdir -p \ /config/{crontabs,www/freshrss} # create symlinks -symlinks=( \ -/app/www/data \ -/app/www/extensions ) +symlinks=( + /app/www/data + /app/www/extensions +) -for i in "${symlinks[@]}" -do +for i in "${symlinks[@]}"; do if [[ -e "$i" && ! -L "$i" ]]; then mv "$i" "${i}.bak" fi @@ -23,7 +24,7 @@ do done # backwards compatibility -if grep -q 'root /config/www/freshrss/p;' /config/nginx/site-confs/default.conf; then +if grep -q 'root /config/www/freshrss/p;' /config/nginx/site-confs/default.conf; then cp /defaults/nginx/site-confs/default.conf.sample /config/nginx/site-confs/default.conf fi diff --git a/root/migrations/02-default-location b/root/migrations/02-default-location index 40a62a6..57db997 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 /usr/share/webapps/freshrss/p;" NEW_ROOT="root /app/www/p;" -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