fix: AutoSetup.bat 处理已存在目录 + git pull 更新

This commit is contained in:
bookworm 2026-04-06 16:23:59 +08:00
parent a565861b31
commit 53b25253fd

View File

@ -9,18 +9,19 @@ echo ====================================================
echo. echo.
:: 检查 auto-setup.ps1 是否在当前目录 :: 检查 auto-setup.ps1 是否在当前目录
if exist "%~dp0auto-setup.ps1" goto :RUN_SETUP if exist "%~dp0auto-setup.ps1" (
cd /d "%~dp0"
goto :RUN_SETUP
)
:: 不在当前目录 — 检查 bookworm-boot 是否已克隆 :: 检查 bookworm-boot 是否已克隆
if exist "%USERPROFILE%\bookworm-boot\auto-setup.ps1" ( if exist "%USERPROFILE%\bookworm-boot\auto-setup.ps1" (
echo [OK] 检测到 bookworm-boot 仓库 echo [OK] 检测到 bookworm-boot 仓库
cd /d "%USERPROFILE%\bookworm-boot" cd /d "%USERPROFILE%\bookworm-boot"
goto :RUN_SETUP goto :RUN_SETUP
) )
:: 都没有 — 先检查 git 再 clone :: 检查 git
echo [..] 首次运行,需要下载配置文件...
echo.
where git >nul 2>nul where git >nul 2>nul
if %errorlevel% neq 0 ( if %errorlevel% neq 0 (
echo [!!] Git 未安装,请先安装 Git: echo [!!] Git 未安装,请先安装 Git:
@ -31,7 +32,13 @@ if %errorlevel% neq 0 (
exit /b 1 exit /b 1
) )
echo [..] 正在克隆引导仓库 (需输入 Gitea 账号密码)... :: bookworm-boot 目录已存在但不完整 — 先删除再克隆
if exist "%USERPROFILE%\bookworm-boot" (
echo [..] 检测到不完整的 bookworm-boot重新下载...
rmdir /s /q "%USERPROFILE%\bookworm-boot" 2>nul
)
echo [..] 首次运行,下载配置文件 (需输入 Gitea 账号密码)...
echo. echo.
git clone https://code.letcareme.com/bookworm/bookworm-boot.git "%USERPROFILE%\bookworm-boot" git clone https://code.letcareme.com/bookworm/bookworm-boot.git "%USERPROFILE%\bookworm-boot"
if %errorlevel% neq 0 ( if %errorlevel% neq 0 (
@ -48,6 +55,9 @@ echo [OK] 引导仓库下载完成
echo. echo.
:RUN_SETUP :RUN_SETUP
:: 更新到最新版本
git pull >nul 2>nul
:: 检测 PowerShell 7 (pwsh) 或退回 5.1 (powershell) :: 检测 PowerShell 7 (pwsh) 或退回 5.1 (powershell)
where pwsh >nul 2>nul where pwsh >nul 2>nul
if %errorlevel% equ 0 ( if %errorlevel% equ 0 (