Skip to content

Commit 161c610

Browse files
committed
Install: Miniconda - Auto Accept TOS
1 parent 9cda7aa commit 161c610

3 files changed

Lines changed: 6 additions & 2 deletions

File tree

.install/linux/faceswap_setup_x64.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,10 +338,11 @@ conda_install() {
338338
info "Installing Miniconda3..."
339339
yellow ; fname="$(basename -- $DL_CONDA)"
340340
bash "$TMP_DIR/$fname" -b -p "$DIR_CONDA"
341+
"$CONDA_EXECUTABLE" tos accept
341342
if $CONDA_TO_PATH ; then
342343
info "Adding Miniconda3 to PATH..."
343344
yellow ; "$CONDA_EXECUTABLE" init
344-
"$CONDA_EXECUTABLE" config --set auto_activate_base false
345+
"$CONDA_EXECUTABLE" config --set auto_activate false
345346
fi
346347
fi
347348
}

.install/macos/faceswap_setup_macos.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,10 +379,11 @@ conda_install() {
379379
info "Installing Miniconda3..."
380380
yellow ; fname="$(basename -- $DL_CONDA)"
381381
bash "$TMP_DIR/$fname" -b -p "$DIR_CONDA"
382+
"$CONDA_EXECUTABLE" tos accept
382383
if $CONDA_TO_PATH ; then
383384
info "Adding Miniconda3 to PATH..."
384385
yellow ; "$CONDA_EXECUTABLE" init zsh bash
385-
"$CONDA_EXECUTABLE" config --set auto_activate_base false
386+
"$CONDA_EXECUTABLE" config --set auto_activate false
386387
fi
387388
fi
388389
}

.install/windows/install.nsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,8 @@ FunctionEnd
361361
Function SetEnvironment
362362
DetailPrint "Initializing Conda..."
363363
SetDetailsPrint listonly
364+
ExecDos::exec /NOUNLOAD /ASYNC /DETAILED "$\"$dirConda\scripts\activate.bat$\" && conda tos accept && conda deactivate"
365+
pop $0
364366
ExecDos::exec /NOUNLOAD /ASYNC /DETAILED "$\"$dirConda\scripts\activate.bat$\" && conda update -y -n base -c defaults conda && conda deactivate"
365367
pop $0
366368
ExecDos::wait $0

0 commit comments

Comments
 (0)