From 8e11f3efca2c2dc4363d58ce1f10b83a33469a8c Mon Sep 17 00:00:00 2001 From: Stefan Zwischenbrugger Date: Mon, 30 Mar 2026 17:54:26 +0200 Subject: [PATCH] deploy.sh: Composer-Pfad automatisch ermitteln (PATH /usr/bin) Vermeidet Abbruch wenn /usr/local/bin/composer fehlt; sonst kein npm build und alte Assets. Made-with: Cursor --- deploy.sh | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/deploy.sh b/deploy.sh index 3c69d40..2228070 100755 --- a/deploy.sh +++ b/deploy.sh @@ -6,16 +6,29 @@ set -Eeuo pipefail # Optional env vars: # APP_DIR=/web/einkauf (Standard; anpassen wenn die App woanders liegt) # PHP_BIN=/usr/bin/php -# COMPOSER_BIN=/usr/local/bin/composer +# COMPOSER_BIN=/usr/bin/composer (optional; sonst PATH oder uebliche Pfade) # NPM_BIN=/usr/bin/npm # RUN_SEED=true APP_DIR="${APP_DIR:-/web/einkauf}" PHP_BIN="${PHP_BIN:-/usr/bin/php}" -COMPOSER_BIN="${COMPOSER_BIN:-/usr/local/bin/composer}" NPM_BIN="${NPM_BIN:-/usr/bin/npm}" RUN_SEED="${RUN_SEED:-false}" +if [ -n "${COMPOSER_BIN:-}" ]; then + : +elif command -v composer >/dev/null 2>&1; then + COMPOSER_BIN="$(command -v composer)" +elif [ -x /usr/bin/composer ]; then + COMPOSER_BIN=/usr/bin/composer +elif [ -x /usr/local/bin/composer ]; then + COMPOSER_BIN=/usr/local/bin/composer +else + echo "Fehler: composer nicht gefunden (PATH, /usr/bin/composer, /usr/local/bin/composer)." >&2 + echo "Installiere Composer oder setze z. B. COMPOSER_BIN=/pfad/zu/composer" >&2 + exit 1 +fi + cd "${APP_DIR}" echo "==> Deploy startet in ${APP_DIR}"