diff --git a/installer/install.sh b/installer/install.sh index 7e3714434c..a41b2891ce 100755 --- a/installer/install.sh +++ b/installer/install.sh @@ -56,7 +56,7 @@ if [ "$PACKAGES_TO_INSTALL" != "" ]; then "$MAMBA_ROOT_PREFIX/micromamba" install -y --prefix "$INSTALL_ENV_DIR" -c conda-forge $PACKAGES_TO_INSTALL fi -if [ -e "$INSTALL_ENV_DIR" ]; then export PATH="$PATH:$INSTALL_ENV_DIR/bin"; fi +if [ -e "$INSTALL_ENV_DIR" ]; then export PATH="$INSTALL_ENV_DIR/bin:$PATH"; fi # get the repo (and load into the current directory) if [ ! -e ".git" ]; then diff --git a/invoke.sh b/invoke.sh index 45de0223b6..4e72fc0591 100755 --- a/invoke.sh +++ b/invoke.sh @@ -2,7 +2,7 @@ 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 + if [ -e "$INSTALL_ENV_DIR" ]; then export PATH="$INSTALL_ENV_DIR/bin:$PATH"; 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) diff --git a/update.sh b/update.sh index a3e30348aa..4b15218560 100755 --- a/update.sh +++ b/update.sh @@ -1,13 +1,18 @@ #!/bin/bash INSTALL_ENV_DIR="$(pwd)/installer_files/env" -if [ -e "$INSTALL_ENV_DIR" ]; then export PATH="$PATH:$INSTALL_ENV_DIR/bin"; fi +if [ -e "$INSTALL_ENV_DIR" ]; then export PATH="$INSTALL_ENV_DIR/bin:$PATH"; fi # update the repo if [ -e ".git" ]; then git pull 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 + OS_NAME=$(uname -s) case "${OS_NAME}" in Linux*) conda env update;;