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

Merge the new Windows Installer scripts, that doesn't use a post-activate hook

build.bat

@@ -8,6 +8,8 @@
 set /p answer=Are you a developer of this project (Y/N)?
 if /i "%answer:~,1%" NEQ "Y" exit /b
 
+@set PYTHONNOUSERSITE=1
+
 @mkdir dist\stable-diffusion-ui
 
 @echo "Downloading components for the installer.."
@@ -15,11 +17,6 @@ if /i "%answer:~,1%" NEQ "Y" exit /b
 @call conda env create --prefix installer -f environment.yaml
 @call conda activate .\installer
 
-@echo "Setting up startup scripts.."
-
-@mkdir installer\etc\conda\activate.d
-@copy scripts\post_activate.bat installer\etc\conda\activate.d\
-
 @echo "Creating a distributable package.."
 
 @call conda install -c conda-forge -y conda-pack
@@ -37,6 +34,7 @@ if /i "%answer:~,1%" NEQ "Y" exit /b
 @copy ..\..\LICENSE .
 @copy "..\..\CreativeML Open RAIL-M License" .
 @copy "..\..\How to install and run.txt" .
+@echo. > scripts\install_status.txt
 
 @echo "Build ready. Zip the 'dist\stable-diffusion-ui' folder."
 

build.sh

@@ -11,6 +11,8 @@ case $yn in
     * ) exit;;
 esac
 
+export PYTHONNOUSERSITE=1
+
 mkdir -p dist/stable-diffusion-ui
 
 echo "Downloading components for the installer.."
@@ -38,6 +40,7 @@ cp ../../scripts/start.sh .
 cp ../../LICENSE .
 cp "../../CreativeML Open RAIL-M License" .
 cp "../../How to install and run.txt" .
+echo "" > scripts/install_status.txt
 
 chmod u+x start.sh
 

scripts/Start Stable Diffusion UI.cmd

@@ -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

scripts/on_env_start.bat

@@ -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 ..
 

scripts/on_sd_start.bat

@@ -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" (

scripts/start.sh

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

ui/sd_internal/env_yaml.patch

@@ -1,7 +1,16 @@
 diff --git a/environment.yaml b/environment.yaml
-index 7f25da8..306750f 100644
+index 7f25da8..19ddcd8 100644
 --- a/environment.yaml
 +++ b/environment.yaml
+@@ -3,7 +3,7 @@ channels:
+   - pytorch
+   - defaults
+ dependencies:
+-  - python=3.8.5
++  - python=3.8.13
+   - pip=20.3
+   - cudatoolkit=11.3
+   - pytorch=1.11.0
 @@ -23,6 +23,8 @@ dependencies:
      - torch-fidelity==0.3.0
      - transformers==4.19.2