From 3772137c8f1b783ef363ca6e4d783aa139e6e776 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Sun, 23 Oct 2022 10:23:43 +0530
Subject: [PATCH] Include usr/bin in the installer PATH; newlines at the end of
 all files

---
 scripts/Developer Console.cmd         | 6 +++---
 scripts/Start Stable Diffusion UI.cmd | 4 ++--
 scripts/bootstrap.bat                 | 2 +-
 scripts/developer_console.sh          | 2 +-
 scripts/on_env_start.bat              | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/Developer Console.cmd b/scripts/Developer Console.cmd
index 288f2b8c..81676136 100644
--- a/scripts/Developer Console.cmd	
+++ b/scripts/Developer Console.cmd	
@@ -5,8 +5,8 @@ echo "Opening Stable Diffusion UI - Developer Console.." & echo.
 set PATH=C:\Windows\System32;%PATH%
 
 @rem set legacy and new installer's PATH, if they exist
-if exist "installer" set PATH=%cd%\installer;%cd%\installer\Library\bin;%cd%\installer\Scripts;%PATH%
-if exist "installer_files\env" set PATH=%cd%\installer_files\env;%cd%\installer_files\env\Library\bin;%cd%\installer_files\env\Scripts;%PATH%
+if exist "installer" set PATH=%cd%\installer;%cd%\installer\Library\bin;%cd%\installer\Scripts;%cd%\installer\Library\usr\bin;%PATH%
+if exist "installer_files\env" set PATH=%cd%\installer_files\env;%cd%\installer_files\env\Library\bin;%cd%\installer_files\env\Scripts;%cd%\installer_files\Library\usr\bin;%PATH%
 
 @rem Test the environment
 echo "Environment Info:"
@@ -24,4 +24,4 @@ echo.
 @rem activate the environment
 call conda activate .\stable-diffusion\env
 
-cmd /k
\ No newline at end of file
+cmd /k
diff --git a/scripts/Start Stable Diffusion UI.cmd b/scripts/Start Stable Diffusion UI.cmd
index 3a8100da..428da218 100644
--- a/scripts/Start Stable Diffusion UI.cmd	
+++ b/scripts/Start Stable Diffusion UI.cmd	
@@ -3,13 +3,13 @@
 set PATH=C:\Windows\System32;%PATH%
 
 @rem set legacy installer's PATH, if it exists
-if exist "installer" set PATH=%cd%\installer;%cd%\installer\Library\bin;%cd%\installer\Scripts;%PATH%
+if exist "installer" set PATH=%cd%\installer;%cd%\installer\Library\bin;%cd%\installer\Scripts;%cd%\installer\Library\usr\bin;%PATH%
 
 @rem Setup the packages required for the installer
 call scripts\bootstrap.bat
 
 @rem set new installer's PATH, if it downloaded any packages
-if exist "installer_files\env" set PATH=%cd%\installer_files\env;%cd%\installer_files\env\Library\bin;%cd%\installer_files\env\Scripts;%PATH%
+if exist "installer_files\env" set PATH=%cd%\installer_files\env;%cd%\installer_files\env\Library\bin;%cd%\installer_files\env\Scripts;%cd%\installer_files\Library\usr\bin;%PATH%
 
 @rem Test the bootstrap
 call where git
diff --git a/scripts/bootstrap.bat b/scripts/bootstrap.bat
index 8a231deb..26d74b52 100644
--- a/scripts/bootstrap.bat
+++ b/scripts/bootstrap.bat
@@ -12,7 +12,7 @@ set INSTALL_ENV_DIR=%cd%\installer_files\env
 set MICROMAMBA_DOWNLOAD_URL=https://github.com/cmdr2/stable-diffusion-ui/releases/download/v1.1/micromamba.exe
 
 @rem figure out whether git and conda needs to be installed
-if exist "%INSTALL_ENV_DIR%" set PATH=%INSTALL_ENV_DIR%;%INSTALL_ENV_DIR%\Library\bin;%INSTALL_ENV_DIR%\Scripts;%PATH%
+if exist "%INSTALL_ENV_DIR%" set PATH=%INSTALL_ENV_DIR%;%INSTALL_ENV_DIR%\Library\bin;%INSTALL_ENV_DIR%\Scripts;%INSTALL_ENV_DIR%\Library\usr\bin;%PATH%
 
 set PACKAGES_TO_INSTALL=
 
diff --git a/scripts/developer_console.sh b/scripts/developer_console.sh
index 53e4ed59..b9f1341e 100755
--- a/scripts/developer_console.sh
+++ b/scripts/developer_console.sh
@@ -28,4 +28,4 @@ if [ "$0" == "bash" ]; then
   conda activate ./stable-diffusion/env
 else
   bash --init-file developer_console.sh
-fi
\ No newline at end of file
+fi
diff --git a/scripts/on_env_start.bat b/scripts/on_env_start.bat
index eb5aa06c..4d402fdc 100644
--- a/scripts/on_env_start.bat
+++ b/scripts/on_env_start.bat
@@ -58,4 +58,4 @@ if "%update_branch%"=="" (
 
 @call scripts\on_sd_start.bat
 
-@pause
\ No newline at end of file
+@pause