From a565861b31912fc421b58aee984fdd4623d98260 Mon Sep 17 00:00:00 2001
From: bookworm <huakoh449@gmail.com>
Date: Mon, 6 Apr 2026 16:11:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20AutoSetup.bat=20=E7=8B=AC=E7=AB=8B?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=8F=AF=E7=94=A8=20+=20CRLF=20=E6=8D=A2?=
 =?UTF-8?q?=E8=A1=8C=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 单独下载时自动 clone boot 仓库再运行 auto-setup.ps1
- 已在 boot 仓库内时直接运行
- 修复 LF→CRLF 换行 (Windows CMD 必须 CRLF)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 Bookworm-AutoSetup.bat | 42 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 40 insertions(+), 2 deletions(-)

diff --git a/Bookworm-AutoSetup.bat b/Bookworm-AutoSetup.bat
index 873fa11..28028b6 100644
--- a/Bookworm-AutoSetup.bat
+++ b/Bookworm-AutoSetup.bat
@@ -1,8 +1,6 @@
 @echo off
 chcp 65001 > nul
 title Bookworm Portable - 全自动安装
-cd /d "%~dp0"
-
 echo.
 echo   ====================================================
 echo     Bookworm Portable - 全自动安装器
@@ -10,6 +8,46 @@ echo     双击即可完成全部配置，无需手动操作
 echo   ====================================================
 echo.
 
+:: 检查 auto-setup.ps1 是否在当前目录
+if exist "%~dp0auto-setup.ps1" goto :RUN_SETUP
+
+:: 不在当前目录 — 检查 bookworm-boot 是否已克隆
+if exist "%USERPROFILE%\bookworm-boot\auto-setup.ps1" (
+    echo   [OK] 检测到 bookworm-boot 仓库
+    cd /d "%USERPROFILE%\bookworm-boot"
+    goto :RUN_SETUP
+)
+
+:: 都没有 — 先检查 git 再 clone
+echo   [..] 首次运行，需要下载配置文件...
+echo.
+where git >nul 2>nul
+if %errorlevel% neq 0 (
+    echo   [!!] Git 未安装，请先安装 Git:
+    echo       https://git-scm.com/download/win
+    echo.
+    echo   安装 Git 后重新双击本文件即可。
+    pause
+    exit /b 1
+)
+
+echo   [..] 正在克隆引导仓库 (需输入 Gitea 账号密码)...
+echo.
+git clone https://code.letcareme.com/bookworm/bookworm-boot.git "%USERPROFILE%\bookworm-boot"
+if %errorlevel% neq 0 (
+    echo.
+    echo   [!!] 克隆失败，请检查:
+    echo       1. 网络是否正常
+    echo       2. Gitea 账号密码是否正确
+    echo       3. 能否访问 https://code.letcareme.com
+    pause
+    exit /b 1
+)
+cd /d "%USERPROFILE%\bookworm-boot"
+echo   [OK] 引导仓库下载完成
+echo.
+
+:RUN_SETUP
 :: 检测 PowerShell 7 (pwsh) 或退回 5.1 (powershell)
 where pwsh >nul 2>nul
 if %errorlevel% equ 0 (