diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 73ea08fd..c110b11f 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -35,7 +35,7 @@ if [ -e "$INSTALL_ENV_DIR" ]; then export PATH="$INSTALL_ENV_DIR/bin:$PATH"; fi PACKAGES_TO_INSTALL="" -if [ ! -e "$LEGACY_INSTALL_ENV_DIR/etc/profile.d/conda.sh" ] && [ ! -e "$INSTALL_ENV_DIR/etc/profile.d/conda.sh" ]; then PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL conda=4.14"; fi +if [ ! -e "$LEGACY_INSTALL_ENV_DIR/etc/profile.d/conda.sh" ] && [ ! -e "$INSTALL_ENV_DIR/etc/profile.d/conda.sh" ]; 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 diff --git a/scripts/on_sd_start.sh b/scripts/on_sd_start.sh index ca8e698f..100d2c03 100755 --- a/scripts/on_sd_start.sh +++ b/scripts/on_sd_start.sh @@ -80,12 +80,12 @@ else exit fi - out_test=`python -c "import torch; import ldm; import transformers; import numpy; import antlr4; print(42)"` - if [ "$out_test" != "42" ]; then - printf "\n\nDependency test failed! Error installing the packages necessary for Stable Diffusion. Sorry about that, please try to:\n 1. Run this installer again.\n 2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n 3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n 4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n" - read -p "Press any key to continue" - exit - fi + # out_test=`python -c "import torch; import ldm; import transformers; import numpy; import antlr4; print(42)"` + # if [ "$out_test" != "42" ]; then + # printf "\n\nDependency test failed! Error installing the packages necessary for Stable Diffusion. Sorry about that, please try to:\n 1. Run this installer again.\n 2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n 3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n 4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n" + # read -p "Press any key to continue" + # exit + # fi echo conda_sd_env_created >> ../scripts/install_status.txt fi