From 500b48c22e700761ee782ae8c9d35655d3f28714 Mon Sep 17 00:00:00 2001
From: Rage <xVRage@gmail.com>
Date: Sun, 5 Jan 2025 09:25:28 -0500
Subject: [PATCH] Some Cleanup to the Installer

---
 Download Modpack.bat | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/Download Modpack.bat b/Download Modpack.bat
index 95c93cb..0aaf429 100644
--- a/Download Modpack.bat	
+++ b/Download Modpack.bat	
@@ -2,13 +2,11 @@
 
 :: Setting initial paths 
 set "mo2_install=%cd%"
-echo %mo2_install%
 set "repository=%mo2_install%\Fika-Tarkov"
-echo %repository%
 
-:: Set path to the portable Git executable (change this if needed)
+:: Set path to the portable Git executable
 set "portable_git=%mo2_install%\PortableGit\bin\git.exe"
-set "portable_7z=%mod_install%\7zr.exe"
+set "portable_7z=%mo2_install%\7zr.exe"
 
 :: Check if curl is installed
 where curl >nul 2>nul
@@ -46,14 +44,7 @@ if not exist "%mo2_install%\7zr.exe" (
     curl -L -o 7zr.exe https://www.7-zip.org/a/7zr.exe
 )
 
-:: where 7z >nul 2>nul
-:: if %errorlevel% neq 0 (
-::     echo ERROR: 7z is not installed or not in your PATH.
-::     echo Please install 7-Zip or NanaZip and add it to your PATH.
-::     pause
-::     exit /b
-:: )
-
+:: Determining if an installation exists already
 IF EXIST "%mo2_install%\ModOrganizer.exe" (
     call :UpdateModpack
     exit /B 0
@@ -63,9 +54,14 @@ IF EXIST "%mo2_install%\ModOrganizer.exe" (
 )
 
 :UpdateModpack
-    echo ----
+    echo !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+    echo                    WARNING! Existing installation detected!
+    echo          Be sure to save a backup of your changes if you want to keep them!
+    echo !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+    echo.
     echo Existing installation detected! Updating modpack, please wait.
-    timeout 5 
+    timeout 10
 
     :: Clone or update the Git repository
     if not exist "Fika-Tarkov\.git" (
@@ -94,11 +90,16 @@ IF EXIST "%mo2_install%\ModOrganizer.exe" (
     exit /B 0
 
 :InstallModpack
+    echo !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+    echo    WARNING! The script will install the modpack in the folder this script is ran from!
+    echo        Be sure that your folder is empty before continuing with the installation!
+    echo !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
     setlocal enableextensions disabledelayedexpansion
     
-    echo ----
+    echo.
     echo No existing installation detected. Downloading modpack.
-    timeout 5
+    timeout 30
 
     :: Requiring user input for game path