From 499a7bacd90c1f96841ca2082d129a7d7268ca5c Mon Sep 17 00:00:00 2001
From: admin <admin@192.168.1.37>
Date: Sun, 30 Aug 2026 14:22:04 +0000
Subject: [PATCH] fix: report installer compose failures

---
 install.sh | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/install.sh b/install.sh
index 1b0782a..ecd0b60 100644
--- a/install.sh
+++ b/install.sh
@@ -26,7 +26,12 @@ progress() {
     printf '[%d/%d] %s\n' "$STEP" "$TOTAL_STEPS" "$1" >>"$INSTALL_LOG"
   fi
 }
-run_logged() { "$@" >>"$INSTALL_LOG" 2>&1; }
+run_logged() {
+  if "$@" >>"$INSTALL_LOG" 2>&1; then
+    return 0
+  fi
+  return 1
+}
 usage() { sed -n '1,20p' "$0"; }
 while (($#)); do
   case "$1" in
@@ -78,6 +83,7 @@ else
   fi
 fi
 chmod 600 "$PG_PASSWORD_FILE"
+rm -f "$INSTALL_DIR/secrets/postgres-password"
 TEMPLATE_DIR="$INSTALL_DIR/bootstrap"
 mkdir -p "$TEMPLATE_DIR"
 template_file() {
@@ -182,11 +188,18 @@ for placeholder, value in values.items():
     content = content.replace(placeholder, value)
 output.write_text(content)
 PY
+rm -f "$INSTALL_DIR/compose.yaml" "$INSTALL_DIR/Dockerfile.bootstrap"
 cp "$COMPOSE_TEMPLATE" "$DOCKERFILE_TEMPLATE" "$INSTALL_DIR/"
 progress '下载 bootstrap runtime'
-run_logged "${COMPOSE[@]}" --project-directory "$INSTALL_DIR" --env-file "$INSTALL_DIR/.env" -f "$INSTALL_DIR/compose.yaml" pull app || die 'bootstrap runtime 下载失败；请确认能访问 git.keeper.work Container Registry'
+  if ! run_logged "${COMPOSE[@]}" --project-directory "$INSTALL_DIR" --env-file "$INSTALL_DIR/.env" -f "$INSTALL_DIR/compose.yaml" pull app; then
+    die 'bootstrap runtime 下载失败；请确认能访问 git.keeper.work Container Registry'
+  fi
 progress '启动 PostgreSQL'
-if [[ $PG_HOST == postgres ]]; then run_logged "${COMPOSE[@]}" --profile local-db --project-directory "$INSTALL_DIR" --env-file "$INSTALL_DIR/.env" -f "$INSTALL_DIR/compose.yaml" up -d postgres || die 'PostgreSQL 启动失败'; fi
+if [[ $PG_HOST == postgres ]]; then
+  if ! run_logged "${COMPOSE[@]}" --profile local-db --project-directory "$INSTALL_DIR" --env-file "$INSTALL_DIR/.env" -f "$INSTALL_DIR/compose.yaml" up -d postgres; then
+    die 'PostgreSQL 启动失败'
+  fi
+fi
 if [[ $PG_HOST == postgres ]]; then
   ready=0
   for elapsed in $(seq 0 118 2); do
@@ -202,9 +215,20 @@ if [[ $PG_HOST == postgres ]]; then
   fi
 fi
 progress '初始化数据库结构'
-if (( EXISTING_DB )); then export XYMEDIA_EXTERNAL_MIGRATION_CONFIRM=YES; run_logged "${COMPOSE[@]}" --profile migration --project-directory "$INSTALL_DIR" --env-file "$INSTALL_DIR/.env" -f "$INSTALL_DIR/compose.yaml" run --rm --no-deps app-migrate migrate --config /app/config.yaml || die '已有数据库迁移失败'; else run_logged "${COMPOSE[@]}" --profile migration --project-directory "$INSTALL_DIR" --env-file "$INSTALL_DIR/.env" -f "$INSTALL_DIR/compose.yaml" run --rm --no-deps app-migrate migrate --new --config /app/config.yaml || die '数据库初始化失败'; fi
+if (( EXISTING_DB )); then
+  export XYMEDIA_EXTERNAL_MIGRATION_CONFIRM=YES
+  if ! run_logged "${COMPOSE[@]}" --profile migration --project-directory "$INSTALL_DIR" --env-file "$INSTALL_DIR/.env" -f "$INSTALL_DIR/compose.yaml" run --rm --no-deps app-migrate migrate --config /app/config.yaml; then
+    die '已有数据库迁移失败'
+  fi
+else
+  if ! run_logged "${COMPOSE[@]}" --profile migration --project-directory "$INSTALL_DIR" --env-file "$INSTALL_DIR/.env" -f "$INSTALL_DIR/compose.yaml" run --rm --no-deps app-migrate migrate --new --config /app/config.yaml; then
+    die '数据库初始化失败'
+  fi
+fi
 progress '启动 XyMediaVault 服务'
-run_logged "${COMPOSE[@]}" --project-directory "$INSTALL_DIR" --env-file "$INSTALL_DIR/.env" -f "$INSTALL_DIR/compose.yaml" up -d app || die 'XyMediaVault 启动失败'
+if ! run_logged "${COMPOSE[@]}" --project-directory "$INSTALL_DIR" --env-file "$INSTALL_DIR/.env" -f "$INSTALL_DIR/compose.yaml" up -d app; then
+  die 'XyMediaVault 启动失败'
+fi
 for elapsed in $(seq 0 118 2); do
   curl --fail --silent "http://127.0.0.1:$API_PORT/api/health" >/dev/null && { cp "$INSTALL_LOG" "$INSTALL_DIR/install.log" 2>/dev/null || true; printf '\033[2K\r[%d/%d] 安装完成：XyMediaVault 已就绪\n' "$TOTAL_STEPS" "$TOTAL_STEPS"; printf '管理地址：http://127.0.0.1:%s\n安装日志：%s\n' "$API_PORT" "$INSTALL_LOG"; exit 0; }
   printf '\033[2K\r[%d/%d] 等待 XyMediaVault 健康检查（%s 秒）' "$STEP" "$TOTAL_STEPS" "$elapsed"