mirror of
https://github.com/easydiffusion/easydiffusion.git
synced 2024-11-22 16:23:28 +01:00
Use call to start the conda script; activate the installer env first even in the developer console
This commit is contained in:
parent
0c2d227da1
commit
f732fa9736
@ -8,6 +8,9 @@ set PATH=C:\Windows\System32;%PATH%
|
|||||||
if exist "installer" set PATH=%cd%\installer;%cd%\installer\Library\bin;%cd%\installer\Scripts;%cd%\installer\Library\usr\bin;%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%
|
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 activate the installer env
|
||||||
|
call conda activate
|
||||||
|
|
||||||
@rem Test the environment
|
@rem Test the environment
|
||||||
echo "Environment Info:"
|
echo "Environment Info:"
|
||||||
call where git
|
call where git
|
||||||
|
@ -12,7 +12,7 @@ call scripts\bootstrap.bat
|
|||||||
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%
|
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 activate the installer env
|
@rem activate the installer env
|
||||||
conda activate
|
call conda activate
|
||||||
|
|
||||||
@rem Test the bootstrap
|
@rem Test the bootstrap
|
||||||
call where git
|
call where git
|
||||||
|
@ -8,6 +8,12 @@ if [ "$0" == "bash" ]; then
|
|||||||
if [ -e "installer" ]; then export PATH="$(pwd)/installer/bin:$PATH"; fi
|
if [ -e "installer" ]; then export PATH="$(pwd)/installer/bin:$PATH"; fi
|
||||||
if [ -e "installer_files/env" ]; then export PATH="$(pwd)/installer_files/env/bin:$PATH"; fi
|
if [ -e "installer_files/env" ]; then export PATH="$(pwd)/installer_files/env/bin:$PATH"; fi
|
||||||
|
|
||||||
|
# activate the installer env
|
||||||
|
CONDA_BASEPATH=$(conda info --base)
|
||||||
|
source "$CONDA_BASEPATH/etc/profile.d/conda.sh" # avoids the 'shell not initialized' error
|
||||||
|
|
||||||
|
conda activate
|
||||||
|
|
||||||
# test the environment
|
# test the environment
|
||||||
echo "Environment Info:"
|
echo "Environment Info:"
|
||||||
which git
|
which git
|
||||||
|
Loading…
Reference in New Issue
Block a user