Some Cleanup to the Installer
This commit is contained in:
parent
adad3071e9
commit
500b48c22e
|
@ -2,13 +2,11 @@
|
||||||
|
|
||||||
:: Setting initial paths
|
:: Setting initial paths
|
||||||
set "mo2_install=%cd%"
|
set "mo2_install=%cd%"
|
||||||
echo %mo2_install%
|
|
||||||
set "repository=%mo2_install%\Fika-Tarkov"
|
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_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
|
:: Check if curl is installed
|
||||||
where curl >nul 2>nul
|
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
|
curl -L -o 7zr.exe https://www.7-zip.org/a/7zr.exe
|
||||||
)
|
)
|
||||||
|
|
||||||
:: where 7z >nul 2>nul
|
:: Determining if an installation exists already
|
||||||
:: 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
|
|
||||||
:: )
|
|
||||||
|
|
||||||
IF EXIST "%mo2_install%\ModOrganizer.exe" (
|
IF EXIST "%mo2_install%\ModOrganizer.exe" (
|
||||||
call :UpdateModpack
|
call :UpdateModpack
|
||||||
exit /B 0
|
exit /B 0
|
||||||
|
@ -63,9 +54,14 @@ IF EXIST "%mo2_install%\ModOrganizer.exe" (
|
||||||
)
|
)
|
||||||
|
|
||||||
:UpdateModpack
|
: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.
|
echo Existing installation detected! Updating modpack, please wait.
|
||||||
timeout 5
|
timeout 10
|
||||||
|
|
||||||
:: Clone or update the Git repository
|
:: Clone or update the Git repository
|
||||||
if not exist "Fika-Tarkov\.git" (
|
if not exist "Fika-Tarkov\.git" (
|
||||||
|
@ -94,11 +90,16 @@ IF EXIST "%mo2_install%\ModOrganizer.exe" (
|
||||||
exit /B 0
|
exit /B 0
|
||||||
|
|
||||||
:InstallModpack
|
: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
|
setlocal enableextensions disabledelayedexpansion
|
||||||
|
|
||||||
echo ----
|
echo.
|
||||||
echo No existing installation detected. Downloading modpack.
|
echo No existing installation detected. Downloading modpack.
|
||||||
timeout 5
|
timeout 30
|
||||||
|
|
||||||
:: Requiring user input for game path
|
:: Requiring user input for game path
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue