Merge pull request #250 from cmdr2/win-installer-no-activate

Merge the new Windows Installer scripts, that doesn't use a post-activate hook
This commit is contained in:
cmdr2
2022-09-26 19:53:46 +05:30
committed by GitHub
7 changed files with 40 additions and 9 deletions

View File

@@ -1 +1,19 @@
installer\Scripts\activate.bat
@echo off
@REM Delete the post-activate hook from the old installer
@if exist "installer\etc\conda\activate.d\post_activate.bat" (
del "installer\etc\conda\activate.d\post_activate.bat"
)
@call installer\Scripts\activate.bat
@call conda-unpack
@call conda --version
@call git --version
@cd installer
@call scripts\on_env_start.bat
@pause

View File

@@ -2,7 +2,7 @@
@echo. & echo "Stable Diffusion UI - v2" & echo.
@REM set PATH=C:\Windows\System32;%PATH%
set PATH=C:\Windows\System32;%PATH%
@cd ..

View File

@@ -79,7 +79,7 @@
@echo conda_sd_env_created >> ..\scripts\install_status.txt
)
@REM set PATH=C:\Windows\System32;%PATH%
set PATH=C:\Windows\System32;%PATH%
@>nul grep -c "conda_sd_gfpgan_deps_installed" ..\scripts\install_status.txt
@if "%ERRORLEVEL%" EQU "0" (

View File

@@ -4,4 +4,7 @@ source installer/bin/activate
conda-unpack
conda --version
git --version
scripts/on_env_start.sh