From 8316a002da5937a34535061453c348e681035143 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Mon, 21 Nov 2022 17:11:38 +0530 Subject: [PATCH 1/7] Don't warn about whitespace in the git patch application --- scripts/on_sd_start.bat | 4 ++-- scripts/on_sd_start.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/on_sd_start.bat b/scripts/on_sd_start.bat index 79a51205..c0fe4a64 100644 --- a/scripts/on_sd_start.bat +++ b/scripts/on_sd_start.bat @@ -37,8 +37,8 @@ if exist "Open Developer Console.cmd" del "Open Developer Console.cmd" @call git pull @call git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c - @call git apply --whitespace=fix ..\ui\sd_internal\ddim_callback.patch - @call git apply --whitespace=fix ..\ui\sd_internal\env_yaml.patch + @call git apply --whitespace=nowarn ..\ui\sd_internal\ddim_callback.patch + @call git apply --whitespace=nowarn ..\ui\sd_internal\env_yaml.patch @cd .. ) else ( diff --git a/scripts/on_sd_start.sh b/scripts/on_sd_start.sh index a4f92428..903e7e44 100755 --- a/scripts/on_sd_start.sh +++ b/scripts/on_sd_start.sh @@ -30,8 +30,8 @@ if [ -e "scripts/install_status.txt" ] && [ `grep -c sd_git_cloned scripts/insta git pull git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c - git apply --whitespace=fix ../ui/sd_internal/ddim_callback.patch || fail "ddim patch failed" - git apply --whitespace=fix ../ui/sd_internal/env_yaml.patch || fail "yaml patch failed" + git apply --whitespace=nowarn ../ui/sd_internal/ddim_callback.patch || fail "ddim patch failed" + git apply --whitespace=nowarn ../ui/sd_internal/env_yaml.patch || fail "yaml patch failed" cd .. else From eef9af2266a7236b96eeb1b8a81db2f2bd427188 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Mon, 21 Nov 2022 17:14:34 +0530 Subject: [PATCH 2/7] Typo --- scripts/on_sd_start.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/on_sd_start.bat b/scripts/on_sd_start.bat index c0fe4a64..6f5ab212 100644 --- a/scripts/on_sd_start.bat +++ b/scripts/on_sd_start.bat @@ -20,7 +20,7 @@ call conda activate @rem @echo. & echo "Error activating conda for Stable Diffusion. Sorry about that, please try to:" & echo " 1. Run this installer again." & echo " 2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo " 3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo " 4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo. @rem pause @rem exit /b -@rem) +@rem ) @REM remove the old version of the dev console script, if it's still present if exist "Open Developer Console.cmd" del "Open Developer Console.cmd" From 3bf5e11f94b9e71ff124a9df6660444603dea9e6 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Mon, 21 Nov 2022 17:19:55 +0530 Subject: [PATCH 3/7] Nowarn for fresh installation (git apply whitespace) --- scripts/on_sd_start.bat | 4 ++-- scripts/on_sd_start.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/on_sd_start.bat b/scripts/on_sd_start.bat index 6f5ab212..1acb7b3a 100644 --- a/scripts/on_sd_start.bat +++ b/scripts/on_sd_start.bat @@ -55,8 +55,8 @@ if exist "Open Developer Console.cmd" del "Open Developer Console.cmd" @cd stable-diffusion @call git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c - @call git apply --whitespace=fix ..\ui\sd_internal\ddim_callback.patch - @call git apply --whitespace=fix ..\ui\sd_internal\env_yaml.patch + @call git apply --whitespace=nowarn ..\ui\sd_internal\ddim_callback.patch + @call git apply --whitespace=nowarn ..\ui\sd_internal\env_yaml.patch @cd .. ) diff --git a/scripts/on_sd_start.sh b/scripts/on_sd_start.sh index 903e7e44..7745855a 100755 --- a/scripts/on_sd_start.sh +++ b/scripts/on_sd_start.sh @@ -46,8 +46,8 @@ else cd stable-diffusion git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c - git apply --whitespace=fix ../ui/sd_internal/ddim_callback.patch || fail "ddim patch failed" - git apply --whitespace=fix ../ui/sd_internal/env_yaml.patch || fail "yaml patch failed" + git apply --whitespace=nowarn ../ui/sd_internal/ddim_callback.patch || fail "ddim patch failed" + git apply --whitespace=nowarn ../ui/sd_internal/env_yaml.patch || fail "yaml patch failed" cd .. fi From 6dc99e676e2f69312657fa8a8d407ce7813b30a2 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Mon, 21 Nov 2022 18:42:07 +0530 Subject: [PATCH 4/7] Reduce the width of the editor sidebar, regression --- ui/media/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/media/css/main.css b/ui/media/css/main.css index a2cf8b38..0cf83302 100644 --- a/ui/media/css/main.css +++ b/ui/media/css/main.css @@ -515,7 +515,7 @@ img { } #editor-settings { - min-width: 500px; + min-width: 350px; } #editor-settings-entries { From 9c71c966ca5d21cb13f96ed60848570defe1e240 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Tue, 22 Nov 2022 10:39:47 +0530 Subject: [PATCH 5/7] Shell error code check --- scripts/bootstrap.bat | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/bootstrap.bat b/scripts/bootstrap.bat index 7d067cc3..cb0909d0 100644 --- a/scripts/bootstrap.bat +++ b/scripts/bootstrap.bat @@ -42,11 +42,11 @@ if "%PACKAGES_TO_INSTALL%" NEQ "" ( mkdir "%MAMBA_ROOT_PREFIX%" call curl -Lk "%MICROMAMBA_DOWNLOAD_URL%" > "%MAMBA_ROOT_PREFIX%\micromamba.exe" - @REM if "%ERRORLEVEL%" NEQ "0" ( - @REM echo "There was a problem downloading micromamba. Cannot continue." - @REM pause - @REM exit /b - @REM ) + if "%ERRORLEVEL%" NEQ "0" ( + echo "There was a problem downloading micromamba. Cannot continue." + pause + exit /b + ) mkdir "%APPDATA%" mkdir "%USERPROFILE%" From 87a7b70a27fe77e4cedc262fce57e0a7cef34f31 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Tue, 22 Nov 2022 10:40:20 +0530 Subject: [PATCH 6/7] Shell error code check --- scripts/on_sd_start.bat | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/on_sd_start.bat b/scripts/on_sd_start.bat index 1acb7b3a..f1b459cb 100644 --- a/scripts/on_sd_start.bat +++ b/scripts/on_sd_start.bat @@ -16,11 +16,11 @@ if exist "%cd%\profile" ( @rem activate the installer env call conda activate -@rem @if "%ERRORLEVEL%" NEQ "0" ( -@rem @echo. & echo "Error activating conda for Stable Diffusion. Sorry about that, please try to:" & echo " 1. Run this installer again." & echo " 2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo " 3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo " 4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo. -@rem pause -@rem exit /b -@rem ) +@if "%ERRORLEVEL%" NEQ "0" ( + @echo. & echo "Error activating conda for Stable Diffusion. Sorry about that, please try to:" & echo " 1. Run this installer again." & echo " 2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo " 3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo " 4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo. + pause + exit /b +) @REM remove the old version of the dev console script, if it's still present if exist "Open Developer Console.cmd" del "Open Developer Console.cmd" From ff3ca8b36b8a48ec521be006acd26f0e6a4bd58e Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Tue, 22 Nov 2022 10:48:43 +0530 Subject: [PATCH 7/7] link to new downloads --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 47edb505..2038c15b 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ Useful for judging (and stopping) an image quickly, without waiting for it to fi You don't need to install or struggle with Python, Anaconda, Docker etc. The installer will take care of whatever is needed. # Installation -1. **Download** [for Windows](https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.3.5/stable-diffusion-ui-windows.zip) or [for Linux](https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.3.5/stable-diffusion-ui-linux.zip). +1. **Download** [for Windows](https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.4.13/stable-diffusion-ui-windows.zip) or [for Linux](https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.4.13/stable-diffusion-ui-linux.zip). 2. **Extract**: - For Windows: After unzipping the file, please move the `stable-diffusion-ui` folder to your `C:` (or any drive like D:, at the top root level), e.g. `C:\stable-diffusion-ui`. This will avoid a common problem with Windows (file path length limits).