From 7c2b0ec2b556abd0dcbf635487223e7dc91f5b00 Mon Sep 17 00:00:00 2001 From: maro Date: Wed, 16 Sep 2026 20:49:28 +0200 Subject: [PATCH] fix: make setup safe in repository directory --- setup.sh | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/setup.sh b/setup.sh index ab06069..f84e6c5 100755 --- a/setup.sh +++ b/setup.sh @@ -383,7 +383,8 @@ fi REGISTRY_HOST="$(env_get REGISTRY)"; REGISTRY_HOST="${REGISTRY_HOST:-ghcr.io}" log_info "Prüfe Registry-Erreichbarkeit ($REGISTRY_HOST) …" REGISTRY_REACHABLE=false -REGISTRY_HTTP_CODE="$(curl -fsS -o /dev/null -w '%{http_code}' --max-time 5 "https://${REGISTRY_HOST}/v2/" 2>/dev/null || echo "000")" +REGISTRY_HTTP_CODE="$(curl -sS -o /dev/null -w '%{http_code}' --max-time 5 "https://${REGISTRY_HOST}/v2/" 2>/dev/null || true)" +REGISTRY_HTTP_CODE="${REGISTRY_HTTP_CODE:-000}" if [ "$REGISTRY_HTTP_CODE" = "200" ] || [ "$REGISTRY_HTTP_CODE" = "401" ]; then REGISTRY_REACHABLE=true log_success "Registry erreichbar (HTTP $REGISTRY_HTTP_CODE)." @@ -459,9 +460,17 @@ echo "AUTO_DEPLOY: $(env_get AUTO_DEPLOY)" # --------------------------------------------------------------------------- step "Deployment-Dateien" -$SUDO cp "$REPO_DIR/docker-compose.yml" "$PROD_DIR/docker-compose.yml" -$SUDO cp "$REPO_DIR/docker-compose.override.yml.example" "$PROD_DIR/docker-compose.override.yml.example" -$SUDO cp "$REPO_DIR/deploy.sh" "$PROD_DIR/deploy.sh" +copy_to_prod() { + local source="$1" destination="$2" + if [ "$(readlink -f "$source")" = "$(readlink -f "$destination")" ]; then + return 0 + fi + $SUDO cp "$source" "$destination" +} + +copy_to_prod "$REPO_DIR/docker-compose.yml" "$PROD_DIR/docker-compose.yml" +copy_to_prod "$REPO_DIR/docker-compose.override.yml.example" "$PROD_DIR/docker-compose.override.yml.example" +copy_to_prod "$REPO_DIR/deploy.sh" "$PROD_DIR/deploy.sh" $SUDO chmod +x "$PROD_DIR/deploy.sh" log_success "docker-compose.yml + deploy.sh nach $PROD_DIR übertragen."