From 5dcee6245a24edd22c8e2748c8342d2512e01de9 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Thu, 13 Oct 2022 17:59:50 +0530 Subject: [PATCH] Point to the official repo; Put a temp pre-PR hack to allow the installer to be tested before the PR is merged --- installer/install.bat | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/installer/install.bat b/installer/install.bat index 1472cff..26dbc33 100644 --- a/installer/install.bat +++ b/installer/install.bat @@ -42,6 +42,15 @@ if "%PACKAGES_TO_INSTALL%" NEQ "" ( echo "Packages to install:%PACKAGES_TO_INSTALL%" call "%MAMBA_ROOT_PREFIX%\micromamba.exe" install -y --prefix "%INSTALL_ENV_DIR%" -c conda-forge %PACKAGES_TO_INSTALL% + + @rem !! The next 3 lines will be removed before the PR is merged. + @rem !! They are needed so the sd-webui folks can test the installer + @rem !! before the PR is merged. Otherwise webui.cmd won't know that it needs + @rem !! to also check inside %INSTALL_ENV_DIR% + if exist "%INSTALL_ENV_DIR%\etc\profile.d\conda.sh" ( + echo %INSTALL_ENV_DIR% > custom-conda-path.txt + ) + @rem !! Remove the above 3 lines before merging the PR ) set PATH=%INSTALL_ENV_DIR%;%INSTALL_ENV_DIR%\Library\bin;%INSTALL_ENV_DIR%\Scripts;%PATH% @@ -50,7 +59,7 @@ set PATH=%INSTALL_ENV_DIR%;%INSTALL_ENV_DIR%\Library\bin;%INSTALL_ENV_DIR%\Scrip if not exist ".git" ( call git config --global init.defaultBranch master call git init - call git remote add origin https://github.com/cmdr2/hkly-webui.git + call git remote add origin https://github.com/sd-webui/stable-diffusion-webui.git call git fetch call git checkout origin/master -ft )