mirror of
https://github.com/easydiffusion/easydiffusion.git
synced 2025-02-04 12:40:22 +01:00
Include usr/bin in the installer PATH; newlines at the end of all files
This commit is contained in:
parent
338c2243e3
commit
3772137c8f
@ -5,8 +5,8 @@ echo "Opening Stable Diffusion UI - Developer Console.." & echo.
|
|||||||
set PATH=C:\Windows\System32;%PATH%
|
set PATH=C:\Windows\System32;%PATH%
|
||||||
|
|
||||||
@rem set legacy and new installer's PATH, if they exist
|
@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" 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;%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
|
@rem Test the environment
|
||||||
echo "Environment Info:"
|
echo "Environment Info:"
|
||||||
@ -24,4 +24,4 @@ echo.
|
|||||||
@rem activate the environment
|
@rem activate the environment
|
||||||
call conda activate .\stable-diffusion\env
|
call conda activate .\stable-diffusion\env
|
||||||
|
|
||||||
cmd /k
|
cmd /k
|
||||||
|
@ -3,13 +3,13 @@
|
|||||||
set PATH=C:\Windows\System32;%PATH%
|
set PATH=C:\Windows\System32;%PATH%
|
||||||
|
|
||||||
@rem set legacy installer's PATH, if it exists
|
@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
|
@rem Setup the packages required for the installer
|
||||||
call scripts\bootstrap.bat
|
call scripts\bootstrap.bat
|
||||||
|
|
||||||
@rem set new installer's PATH, if it downloaded any packages
|
@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
|
@rem Test the bootstrap
|
||||||
call where git
|
call where git
|
||||||
|
@ -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
|
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
|
@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=
|
set PACKAGES_TO_INSTALL=
|
||||||
|
|
||||||
|
@ -28,4 +28,4 @@ if [ "$0" == "bash" ]; then
|
|||||||
conda activate ./stable-diffusion/env
|
conda activate ./stable-diffusion/env
|
||||||
else
|
else
|
||||||
bash --init-file developer_console.sh
|
bash --init-file developer_console.sh
|
||||||
fi
|
fi
|
||||||
|
@ -58,4 +58,4 @@ if "%update_branch%"=="" (
|
|||||||
|
|
||||||
@call scripts\on_sd_start.bat
|
@call scripts\on_sd_start.bat
|
||||||
|
|
||||||
@pause
|
@pause
|
||||||
|
Loading…
Reference in New Issue
Block a user