diff --git a/installer-linux.sh b/installer-linux.sh index 2d4c6d2..c7e3424 100644 --- a/installer-linux.sh +++ b/installer-linux.sh @@ -1,19 +1,18 @@ #!/bin/bash +# shebang! echo "################" echo SCRIPT STARTING echo "################" -#template -#printf "${process0}"\\r; -#zip; -#printf "${process0} \e[32m[DONE!]\e[0m" +# template +# printf "${process0}"\\r; +# zip; +# printf "${process0} \e[32m[DONE!]\e[0m" moddir="~/.minecraft" cd ${moddir} - - process0="Backing up existing mod folder..." printf "${process0}"\\r; zip -r -q ./mods/.mod-folder-backup.zip mods && printf "${process0} \e[32m[DONE!]\e[0m" @@ -28,26 +27,20 @@ sudo rm /home/$USER/.minecraft/mods/* && printf "${process1} \e[32m[DONE!]\e[0m" echo sleep 1 - - moddir="/home/$USER/.minecraft/mods" cd ${moddir} - - process2="Downloading mod package..." printf "${process2}"\\r; -sudo curl http://192.168.7.208:420/api/shares/YxMjU3N/files/e641be0e-bccd-4f3d-8a86-7dbbb8f88263 -O -J -L -s && printf "${process2} \e[32m[DONE!]\e[0m" -#what the fuck? -#how does this work? -#fix this. +sudo curl -k "https://git.adolin.xyz/saru/lobotomy-mod-pack/raw/branch/main/mods.zip" -H "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/png,image/svg+xml,*/*;q=0.8" -H "Accept-Language: en-US,en;q=0.5" -H "Accept-Encoding: gzip, deflate, br, zstd" -H "DNT: 1" -H "Sec-GPC: 1" -H "Alt-Used: git.adolin.xyz" -H "Connection: keep-alive" -H "Upgrade-Insecure-Requests: 1" -H "Sec-Fetch-Dest: document" -H "Sec-Fetch-Mode: navigate" -H "Sec-Fetch-Site: same-origin" -H "Sec-Fetch-User: ?1" -H "Priority: u=0, i" -H "TE: trailers" -H "Authorization: token ***REMOVED***" -o mods.tar.gz -O -J -L -s && printf "${process2} \e[32m[DONE!]\e[0m" +# fixed! echo sleep 1 - process3="Extracting package..." printf "${process3}"\\r; unzip -q mod-archive.zip; + # HATE. that this still uses a zip archive. need to replace with a tarball. printf "${process3} \e[32m[DONE!]\e[0m" echo sleep 1 diff --git a/installer-windows.bat b/installer-windows.bat index 0c12bed..52f33e9 100644 --- a/installer-windows.bat +++ b/installer-windows.bat @@ -3,12 +3,15 @@ set mcroot="%USERPROFILE%\AppData\Roaming\.minecraft" set modfolder="%USERPROFILE%\AppData\Roaming\.minecraft\mods" set cusdate=%DATE:~4,2%-%DATE:~7,2%-%DATE:~10,4% +:: environment variables echo "################" echo SCRIPT STARTING echo "################" echo. @timeout /t 1 >nul 2>&1 + :: been using this timeout line for 4 years now and for the life of me i still dont know why it works + :: its hitting me that i should probably pick something better echo Downloading latest fabric installer... @@ -17,22 +20,33 @@ echo Downloading latest fabric installer... ECHO ###### !!!!! ###### echo MAKE SURE YOU PICK THE CURRENT SERVER MINECRAFT VERSION, 1.20.1 echo You only need to change the minecraft version, don't worry about the launcher version option. + :: no one is gonna read this and im gonna get some dumbass questions. ECHO ###### !!!!! ###### + start /WAIT "%mcroot%" fabricinstaller.exe + :: `/WAIT` serves to stop the bat script from moving on until the windows closes. only works for some programs, luckily the fabric installer is one of them. + :: maybe needs a way to check if the installer actually needs to be updated. runs every time right now. annoying for beta testers. echo Updating... cd /d %mcroot% curl -k "https://git.adolin.xyz/saru/lobotomy-mod-pack/raw/branch/main/mods.tar.gz" -H "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/png,image/svg+xml,*/*;q=0.8" -H "Accept-Language: en-US,en;q=0.5" -H "Accept-Encoding: gzip, deflate, br, zstd" -H "DNT: 1" -H "Sec-GPC: 1" -H "Alt-Used: git.adolin.xyz" -H "Connection: keep-alive" -H "Upgrade-Insecure-Requests: 1" -H "Sec-Fetch-Dest: document" -H "Sec-Fetch-Mode: navigate" -H "Sec-Fetch-Site: same-origin" -H "Sec-Fetch-User: ?1" -H "Priority: u=0, i" -H "TE: trailers" -H "Authorization: token ***REMOVED***" -o mods.tar.gz + :: GOD i fucking hate this line so much why does it need allat echo Compressing and backing up existing mods... tar -czf %mcroot%/mods-backup-%cusdate%.tar.gz %modfolder% @timeout /t 2 >nul 2>&1 + :: tar on windows is some bullshit + :: like why the fuck is it easier to extract a tarball than a fucking zip file + :: didnt microcock literally invent and standardize that file format themselves? + :: why is it fucking impossible to automate zipping and unzipping files on WINDOWS?? + :: ITS EASIER ON LINUX. echo Deleting existing mods... rmdir /S /Q mods mkdir mods + :: sloppy @timeout /t 2 >nul 2>&1 tar -xvzf %mcroot%/mods.tar.gz -C %modfolder% @@ -70,10 +84,14 @@ echo Updating... ::: =: =: ::: --::.-- ::: .... +::someone's gonna think im a furry or a femboy or some shit because of this. for /f "delims=: tokens=*" %%A in ('findstr /b ::: "%~f0"') do @echo(%%A) -echo Sigma! -echo All done. C: +:: this line prints every line that starts with ':::' non-destructively - pretty cool. +:: easier than escaping every single symbol that could potentially be interpreted as a functional character + +echo Sigma! All done. C: echo This window will close in ten seconds. + :: FBI secret agent self-destructing message headass. @timeout /t 10 >nul 2>&1 exit