Upload 3 files

installer/installer.py

@@ -35,7 +35,7 @@ def install_dependencies():
     run_cmd("conda install -y -k git")
     run_cmd("git clone https://github.com/C0untFloyd/roop-unleashed.git")
     os.chdir(MY_PATH)
-    run_cmd("git checkout ebf163acdb66de17abf408a86a72d00ddf49480c")
+    run_cmd("git checkout 5bfafdc97a0c47b46ec83e6530a57399aaad75d7")
     # Installs dependencies from requirements.txt
     run_cmd("python -m pip install -r requirements.txt")
 

installer/macOSinstaller.sh

@@ -0,0 +1,73 @@
+#!/bin/bash
+
+# This script checks and installs all dependencies which are needed to run roop-unleashed. After that, it clones the repo.
+# Execute this easily with /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/PJF16/roop-unleashed/master/installer/macOSinstaller.sh)
+
+# Function to check if a command exists
+command_exists() {
+    command -v "$1" >/dev/null 2>&1
+}
+
+echo "Starting check and installation process of dependencies for roop-unleashed"
+
+# Check if Homebrew is installed
+if ! command_exists brew; then
+    echo "Homebrew is not installed. Starting installation..."
+    /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+else
+    echo "Homebrew is already installed."
+fi
+
+# Update Homebrew
+echo "Updating Homebrew..."
+brew update
+
+# Check if Python 3.11 is installed
+if brew list --versions [email protected] >/dev/null; then
+    echo "Python 3.11 is already installed."
+else
+    echo "Python 3.11 is not installed. Installing it now..."
+    brew install [email protected]
+fi
+
+# Check if [email protected] is installed
+if brew list --versions [email protected] >/dev/null; then
+    echo "[email protected] is already installed."
+else
+    echo "[email protected] is not installed. Installing it now..."
+    brew install [email protected]
+fi
+
+# Check if ffmpeg is installed
+if command_exists ffmpeg; then
+    echo "ffmpeg is already installed."
+else
+    echo "ffmpeg is not installed. Installing it now..."
+    brew install ffmpeg
+fi
+
+# Check if git is installed
+if command_exists git; then
+    echo "git is already installed."
+else
+    echo "git is not installed. Installing it now..."
+    brew install git
+fi
+
+# Clone the repository
+REPO_URL="https://github.com/C0untFloyd/roop-unleashed.git"
+REPO_NAME="roop-unleashed"
+
+echo "Cloning the repository $REPO_URL..."
+git clone $REPO_URL
+
+# Check if the repository was cloned successfully
+if [ -d "$REPO_NAME" ]; then
+    echo "Repository cloned successfully. Changing into directory $REPO_NAME..."
+    cd "$REPO_NAME"
+else
+    echo "Failed to clone the repository."
+fi
+
+echo "Check and installation process completed."
+

installer/windows_run.bat

@@ -14,7 +14,7 @@ set INSTALL_DIR=%cd%\installer_files
 set CONDA_ROOT_PREFIX=%cd%\installer_files\conda
 set INSTALL_ENV_DIR=%cd%\installer_files\env
 set MINICONDA_DOWNLOAD_URL=https://repo.anaconda.com/miniconda/Miniconda3-latest-Windows-x86_64.exe
-set FFMPEG_DOWNLOAD_URL=https://github.com/GyanD/codexffmpeg/releases/download/2023-06-21-git-1bcb8a7338/ffmpeg-2023-06-21-git-1bcb8a7338-essentials_build.zip
+set FFMPEG_DOWNLOAD_URL=https://github.com/GyanD/codexffmpeg/releases/download/7.1/ffmpeg-7.1-essentials_build.zip
 set INSTALL_FFMPEG_DIR=%cd%\installer_files\ffmpeg
 set INSIGHTFACE_PACKAGE_URL=https://github.com/C0untFloyd/roop-unleashed/releases/download/3.6.6/insightface-0.7.3-cp310-cp310-win_amd64.whl
 set INSIGHTFACE_PACKAGE_PATH=%INSTALL_DIR%\insightface-0.7.3-cp310-cp310-win_amd64.whl
@@ -70,12 +70,8 @@ if "%ffmpeg_exists%" == "F" (
         echo Downloading ffmpeg from %FFMPEG_DOWNLOAD_URL% to %INSTALL_DIR%
         call curl -Lk "%FFMPEG_DOWNLOAD_URL%" > "%INSTALL_DIR%\ffmpeg.zip" || ( echo. && echo ffmpeg failed to download. && goto end )
         call powershell -command "Expand-Archive -Force '%INSTALL_DIR%\ffmpeg.zip' '%INSTALL_DIR%\'"
-        cd "installer_files"
-        setlocal EnableExtensions EnableDelayedExpansion
-        for /f "tokens=*" %%f in ('dir /s /b /ad "ffmpeg\*"') do (
-            ren "%%f" "ffmpeg"
-        )
-        endlocal
+        cd "%INSTALL_DIR%"
+        move ffmpeg-* ffmpeg
         setx PATH "%INSTALL_FFMPEG_DIR%\bin\;%PATH%"
         echo To use videos, you need to restart roop after this installation.
         cd ..