diff --git a/installer/install.sh b/installer/install.sh index 9dd1c03a22..b424170443 100755 --- a/installer/install.sh +++ b/installer/install.sh @@ -68,8 +68,11 @@ if [ ! -e ".git" ]; then fi # create the environment +CONDA_BASEPATH=$(conda info --base) +source "$CONDA_BASEPATH/etc/profile.d/conda.sh" # otherwise conda complains about 'shell not initialized' (needed when running in a script) + if [ "$OS_NAME" == "mac" ]; then - PIP_EXISTS_ACTION=w CONDA_SUBDIR=osx-arm64 conda env create -f environment-mac.yml + PIP_EXISTS_ACTION=w CONDA_SUBDIR=osx-${OS_ARCH} conda env create -f environment-mac.yml else conda env create -f environment.yml fi diff --git a/invoke.sh b/invoke.sh index 639b66233a..676fc77eee 100755 --- a/invoke.sh +++ b/invoke.sh @@ -4,6 +4,9 @@ if [ "$0" == "bash" ]; then INSTALL_ENV_DIR="$(pwd)/installer_files/env" if [ -e "$INSTALL_ENV_DIR" ]; then export PATH="$PATH;$INSTALL_ENV_DIR/bin"; fi + CONDA_BASEPATH=$(conda info --base) + source "$CONDA_BASEPATH/etc/profile.d/conda.sh" # otherwise conda complains about 'shell not initialized' (needed when running in a script) + conda activate invokeai echo "Ready to dream.."