From df14913c678b1adff6f78509e927d0a4a08ef8e8 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sun, 23 Oct 2022 11:16:28 +0530 Subject: [PATCH] Always install conda, don't use the system's version --- scripts/bootstrap.bat | 6 +++--- scripts/bootstrap.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/bootstrap.bat b/scripts/bootstrap.bat index 26d74b52..bf4e2198 100644 --- a/scripts/bootstrap.bat +++ b/scripts/bootstrap.bat @@ -14,10 +14,10 @@ set MICROMAMBA_DOWNLOAD_URL=https://github.com/cmdr2/stable-diffusion-ui/release @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;%INSTALL_ENV_DIR%\Library\usr\bin;%PATH% -set PACKAGES_TO_INSTALL= +set PACKAGES_TO_INSTALL= conda -call conda --version >.tmp1 2>.tmp2 -if "%ERRORLEVEL%" NEQ "0" set PACKAGES_TO_INSTALL=%PACKAGES_TO_INSTALL% conda +rem call conda --version >.tmp1 2>.tmp2 +rem if "%ERRORLEVEL%" NEQ "0" set PACKAGES_TO_INSTALL=%PACKAGES_TO_INSTALL% conda call git --version >.tmp1 2>.tmp2 if "%ERRORLEVEL%" NEQ "0" set PACKAGES_TO_INSTALL=%PACKAGES_TO_INSTALL% git diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 8b556aa4..ca3f86e6 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -32,9 +32,9 @@ MICROMAMBA_DOWNLOAD_URL="https://micro.mamba.pm/api/micromamba/${OS_NAME}-${OS_A # figure out whether git and conda needs to be installed if [ -e "$INSTALL_ENV_DIR" ]; then export PATH="$INSTALL_ENV_DIR/bin:$PATH"; fi -PACKAGES_TO_INSTALL="" +PACKAGES_TO_INSTALL=" conda" -if ! hash "conda" &>/dev/null; then PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL conda"; fi +# if ! hash "conda" &>/dev/null; then PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL conda"; fi if ! hash "git" &>/dev/null; then PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL git"; fi # (if necessary) install git and conda into a contained environment