diff --git a/prod-run.sh b/prod-run.sh index 9cd7f24..0656081 100755 --- a/prod-run.sh +++ b/prod-run.sh @@ -77,9 +77,14 @@ fix_git_remote_and_branch() { } fix_node_modules() { - if [ ! -d "$PROJECT_DIR/node_modules" ] || [ ! -f "$PROJECT_DIR/node_modules/.package-lock.json" ]; then - say "Installing dependencies with npm ci --omit=dev" - npm ci --omit=dev + if [ ! -d "$PROJECT_DIR/node_modules" ]; then + if [ -f "$PROJECT_DIR/package-lock.json" ]; then + say "Installing dependencies with npm ci --omit=dev" + npm ci --omit=dev + else + say "Installing dependencies with npm install --omit=dev (package-lock.json missing)" + npm install --omit=dev + fi fi } @@ -247,8 +252,8 @@ fix_require_and_import_hints() { ensure_logrotate_config() { local conf - conf=$(cat <<'CONF' -/var/www/html/Runewager/logs/runewager*.log /var/www/html/Runewager/logs/crash.log { + conf=$(cat < "$LOGROTATE_FILE" + fi + if [ -f "$LOGROTATE_FILE" ] && command -v logrotate >/dev/null 2>&1; then if ! logrotate -d "$LOGROTATE_FILE" >/dev/null 2>&1; then warn "logrotate dry-run failed for $LOGROTATE_FILE" @@ -296,7 +306,7 @@ ensure_cron_fallback() { ensure_systemd_service() { local conf - conf=$(cat <<'CONF' + conf=$(cat <