Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update install script to follow github redirects when downloading #8

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions src/install_nquake.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
#!/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.
echo

CURL_FLAGS=" -O -L "

# Create the nQuake folder
defaultdir="~/Applications/nQuake"
read -p "Where do you want to install nQuake? [$defaultdir]: " directory
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down