mirror of
https://github.com/easydiffusion/easydiffusion.git
synced 2024-12-27 09:28:56 +01:00
Merge pull request #402 from cmdr2/beta
Retry micromamba download on windows
This commit is contained in:
commit
cf313939aa
@ -11,6 +11,7 @@ set MAMBA_ROOT_PREFIX=%cd%\installer_files\mamba
|
|||||||
set INSTALL_ENV_DIR=%cd%\installer_files\env
|
set INSTALL_ENV_DIR=%cd%\installer_files\env
|
||||||
set LEGACY_INSTALL_ENV_DIR=%cd%\installer
|
set LEGACY_INSTALL_ENV_DIR=%cd%\installer
|
||||||
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
|
||||||
|
set umamba_exists=F
|
||||||
|
|
||||||
@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;%INSTALL_ENV_DIR%\Library\usr\bin;%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%
|
||||||
@ -24,15 +25,13 @@ if not exist "%LEGACY_INSTALL_ENV_DIR%\etc\profile.d\conda.sh" (
|
|||||||
call git --version >.tmp1 2>.tmp2
|
call git --version >.tmp1 2>.tmp2
|
||||||
if "%ERRORLEVEL%" NEQ "0" set PACKAGES_TO_INSTALL=%PACKAGES_TO_INSTALL% git
|
if "%ERRORLEVEL%" NEQ "0" set PACKAGES_TO_INSTALL=%PACKAGES_TO_INSTALL% git
|
||||||
|
|
||||||
|
call "%MAMBA_ROOT_PREFIX%\micromamba.exe" --version >.tmp1 2>.tmp2
|
||||||
|
if "%ERRORLEVEL%" EQU "0" set umamba_exists=T
|
||||||
|
|
||||||
@rem (if necessary) install git and conda into a contained environment
|
@rem (if necessary) install git and conda into a contained environment
|
||||||
if "%PACKAGES_TO_INSTALL%" NEQ "" (
|
if "%PACKAGES_TO_INSTALL%" NEQ "" (
|
||||||
@rem download micromamba
|
@rem download micromamba
|
||||||
set download_umamba=T
|
if "%umamba_exists%" == "F" (
|
||||||
|
|
||||||
call "%MAMBA_ROOT_PREFIX%\micromamba.exe" --version >.tmp1 2>.tmp2
|
|
||||||
if "%ERRORLEVEL%" EQU "0" set download_umamba=F
|
|
||||||
|
|
||||||
if "%download_umamba%" == "T" (
|
|
||||||
echo "Downloading micromamba from %MICROMAMBA_DOWNLOAD_URL% to %MAMBA_ROOT_PREFIX%\micromamba.exe"
|
echo "Downloading micromamba from %MICROMAMBA_DOWNLOAD_URL% to %MAMBA_ROOT_PREFIX%\micromamba.exe"
|
||||||
|
|
||||||
mkdir "%MAMBA_ROOT_PREFIX%"
|
mkdir "%MAMBA_ROOT_PREFIX%"
|
||||||
|
Loading…
Reference in New Issue
Block a user