diff --git a/.install/linux/faceswap_setup_x64.sh b/.install/linux/faceswap_setup_x64.sh index 26d3997..9cbcfaa 100644 --- a/.install/linux/faceswap_setup_x64.sh +++ b/.install/linux/faceswap_setup_x64.sh @@ -338,10 +338,11 @@ conda_install() { info "Installing Miniconda3..." yellow ; fname="$(basename -- $DL_CONDA)" bash "$TMP_DIR/$fname" -b -p "$DIR_CONDA" + "$CONDA_EXECUTABLE" tos accept if $CONDA_TO_PATH ; then info "Adding Miniconda3 to PATH..." yellow ; "$CONDA_EXECUTABLE" init - "$CONDA_EXECUTABLE" config --set auto_activate_base false + "$CONDA_EXECUTABLE" config --set auto_activate false fi fi } diff --git a/.install/macos/faceswap_setup_macos.sh b/.install/macos/faceswap_setup_macos.sh index 804b828..fc46ae4 100644 --- a/.install/macos/faceswap_setup_macos.sh +++ b/.install/macos/faceswap_setup_macos.sh @@ -379,10 +379,11 @@ conda_install() { info "Installing Miniconda3..." yellow ; fname="$(basename -- $DL_CONDA)" bash "$TMP_DIR/$fname" -b -p "$DIR_CONDA" + "$CONDA_EXECUTABLE" tos accept if $CONDA_TO_PATH ; then info "Adding Miniconda3 to PATH..." yellow ; "$CONDA_EXECUTABLE" init zsh bash - "$CONDA_EXECUTABLE" config --set auto_activate_base false + "$CONDA_EXECUTABLE" config --set auto_activate false fi fi } diff --git a/.install/windows/install.nsi b/.install/windows/install.nsi index d407807..13751b1 100644 --- a/.install/windows/install.nsi +++ b/.install/windows/install.nsi @@ -361,6 +361,8 @@ FunctionEnd Function SetEnvironment DetailPrint "Initializing Conda..." SetDetailsPrint listonly + ExecDos::exec /NOUNLOAD /ASYNC /DETAILED "$\"$dirConda\Scripts\conda.exe$\" tos accept" + pop $0 ExecDos::exec /NOUNLOAD /ASYNC /DETAILED "$\"$dirConda\scripts\activate.bat$\" && conda update -y -n base -c defaults conda && conda deactivate" pop $0 ExecDos::wait $0