From b7f2b0c4926cee467e59dbc7b84e23c1cd381b4d Mon Sep 17 00:00:00 2001 From: dill0wn Date: Wed, 5 Jan 2022 09:28:33 -0500 Subject: [PATCH 1/2] update install script to follow github redirects when downloading --- src/install_nquake.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) mode change 100644 => 100755 src/install_nquake.sh diff --git a/src/install_nquake.sh b/src/install_nquake.sh old mode 100644 new mode 100755 index f8263c7..976c0c9 --- a/src/install_nquake.sh +++ b/src/install_nquake.sh @@ -10,6 +10,8 @@ echo echo Press ENTER to use [default] option. echo +CURL_FLAGS=" -O -L " + # Create the nQuake folder defaultdir="~/Applications/nQuake" read -p "Where do you want to install nQuake? [$defaultdir]: " directory @@ -89,7 +91,7 @@ fi echo # Download nquake.ini -curl $proxy -s -o nquake.ini -O https://raw.githubusercontent.com/nQuake/client-win32/master/etc/nquake.ini +curl $proxy -s $CURL_FLAGS https://raw.githubusercontent.com/nQuake/client-win32/master/etc/nquake.ini if [ -s "nquake.ini" ] then echo foo >> /dev/null @@ -128,14 +130,14 @@ echo # Download all the packages echo "=== Downloading ===" echo "Downloading Quake Shareware..." -curl $proxy -o qsw106.zip -O $mirror/qsw106.zip +curl $proxy $CURL_FLAGS $mirror/qsw106.zip echo if [ -s "qsw106.zip" ] then if [ "$(du qsw106.zip | cut -f1)" \> "0" ] then echo "Downloading nQuake setup files (1 of 2)..." - curl $proxy -o gpl.zip -O $mirror/gpl.zip + curl $proxy $CURL_FLAGS $mirror/gpl.zip echo fi fi @@ -144,7 +146,7 @@ then if [ "$(du gpl.zip | cut -f1)" \> "0" ] then echo "Downloading nQuake setup files (2 of 2)..." - curl $proxy -o non-gpl.zip -O $mirror/non-gpl.zip + curl $proxy $CURL_FLAGS $mirror/non-gpl.zip echo fi fi @@ -153,7 +155,7 @@ then if [ "$(du non-gpl.zip | cut -f1)" \> "0" ] then echo "Downloading nQuake OS X files..." - curl $proxy -o macosx.zip -O $mirror/macosx.zip + curl $proxy $CURL_FLAGS $mirror/macosx.zip echo fi fi From e6ca88bd88adbeca65108ddda055c9c1f6021e73 Mon Sep 17 00:00:00 2001 From: dill0wn Date: Tue, 11 Jan 2022 09:39:29 -0500 Subject: [PATCH 2/2] install_nquake osx version bump to v2.3 --- src/install_nquake.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/install_nquake.sh b/src/install_nquake.sh index 976c0c9..b5c3342 100755 --- a/src/install_nquake.sh +++ b/src/install_nquake.sh @@ -1,10 +1,10 @@ #!/bin/bash -# nQuake Bash Installer Script v2.2 (for Mac OS X) +# nQuake Bash Installer Script v2.3 (for Mac OS X) # by Empezar echo -echo Welcome to the nQuake v2.2 installation +echo Welcome to the nQuake v2.3 installation echo ======================================= echo echo Press ENTER to use [default] option.