OSSForks/faceswap
1
0
Fork 0
mirror of https://github.com/zebrajr/faceswap.git synced 2025-12-06 12:20:27 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'staging'
Some checks failed
ci/build / conda (${{ matrix.os }}, ${{ matrix.backend }}) (cpu, macos-latest) (push) Has been cancelled
Details
ci/build / conda (${{ matrix.os }}, ${{ matrix.backend }}) (cpu, ubuntu-latest) (push) Has been cancelled
Details
ci/build / conda (${{ matrix.os }}, ${{ matrix.backend }}) (cpu, windows-latest) (push) Has been cancelled
Details
ci/build / conda (${{ matrix.os }}, ${{ matrix.backend }}) (directml, windows-latest) (push) Has been cancelled
Details
ci/build / conda (${{ matrix.os }}, ${{ matrix.backend }}) (nvidia, macos-latest) (push) Has been cancelled
Details
ci/build / conda (${{ matrix.os }}, ${{ matrix.backend }}) (nvidia, ubuntu-latest) (push) Has been cancelled
Details
ci/build / conda (${{ matrix.os }}, ${{ matrix.backend }}) (nvidia, windows-latest) (push) Has been cancelled
Details
ci/build / conda (${{ matrix.os }}, ${{ matrix.backend }}) (rocm, ubuntu-latest) (push) Has been cancelled
Details
ci/build / pip (ubuntu-latest, ${{ matrix.backend }}) (cpu, 3.10) (push) Has been cancelled
Details
ci/build / pip (windows-latest, ${{ matrix.backend }}) (cpu, 3.10) (push) Has been cancelled
Details
ci/build / pip (windows-latest, ${{ matrix.backend }}) (directml, 3.10) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
torzdf 2025-09-18 14:22:18 +01:00
commit b02075647b
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.install/linux/faceswap_setup_x64.sh
View File

@ -338,10 +338,11 @@ conda_install() {
info "Installing Miniconda3..." info "Installing Miniconda3..."
yellow ; fname="$(basename -- $DL_CONDA)" yellow ; fname="$(basename -- $DL_CONDA)"
bash "$TMP_DIR/$fname" -b -p "$DIR_CONDA" bash "$TMP_DIR/$fname" -b -p "$DIR_CONDA"
"$CONDA_EXECUTABLE" tos accept
if $CONDA_TO_PATH ; then if $CONDA_TO_PATH ; then
info "Adding Miniconda3 to PATH..." info "Adding Miniconda3 to PATH..."
yellow ; "$CONDA_EXECUTABLE" init yellow ; "$CONDA_EXECUTABLE" init
"$CONDA_EXECUTABLE" config --set auto_activate_base false "$CONDA_EXECUTABLE" config --set auto_activate false
fi fi
fi fi
} }

3
.install/macos/faceswap_setup_macos.sh
View File

@ -379,10 +379,11 @@ conda_install() {
info "Installing Miniconda3..." info "Installing Miniconda3..."
yellow ; fname="$(basename -- $DL_CONDA)" yellow ; fname="$(basename -- $DL_CONDA)"
bash "$TMP_DIR/$fname" -b -p "$DIR_CONDA" bash "$TMP_DIR/$fname" -b -p "$DIR_CONDA"
"$CONDA_EXECUTABLE" tos accept
if $CONDA_TO_PATH ; then if $CONDA_TO_PATH ; then
info "Adding Miniconda3 to PATH..." info "Adding Miniconda3 to PATH..."
yellow ; "$CONDA_EXECUTABLE" init zsh bash yellow ; "$CONDA_EXECUTABLE" init zsh bash
"$CONDA_EXECUTABLE" config --set auto_activate_base false "$CONDA_EXECUTABLE" config --set auto_activate false
fi fi
fi fi
} }

2
.install/windows/install.nsi
View File

@ -361,6 +361,8 @@ FunctionEnd
Function SetEnvironment Function SetEnvironment
DetailPrint "Initializing Conda..." DetailPrint "Initializing Conda..."
SetDetailsPrint listonly 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" ExecDos::exec /NOUNLOAD /ASYNC /DETAILED "$\"$dirConda\scripts\activate.bat$\" && conda update -y -n base -c defaults conda && conda deactivate"
pop $0 pop $0
ExecDos::wait $0 ExecDos::wait $0