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.

Sign up for GitHub

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

Jump to bottom

Ensure wget spam less messages on large files #49

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Ensure wget spam less messages on large files #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions scripts/update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ nqiecho() {

nqwget() {
[ -n "${quiet}" ] && {
wget -q $* >/dev/null 2>&1
wget -q --progress=dot:giga $* >/dev/null 2>&1
} || {
wget $*
wget --progress=dot:giga $*
}
}

Expand Down
6 changes: 3 additions & 3 deletions scripts/update_binaries.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ binary=`uname -m`
# Download nquake.ini
mkdir tmp
cd tmp
wget --inet4-only -q -O nquake.ini https://raw.githubusercontent.com/nQuake/client-win32/master/etc/nquake.ini
wget --progress=dot:giga --inet4-only -q -O nquake.ini https://raw.githubusercontent.com/nQuake/client-win32/master/etc/nquake.ini
if [ -s "nquake.ini" ]
then
echo foo >> /dev/null
Expand Down Expand Up @@ -69,9 +69,9 @@ echo
echo "=== Downloading ==="
if [ "$binary" == "x86_64" ]
then
wget --inet4-only -O sv-bin-x64.zip $mirror/sv-bin-x64.zip
wget --progress=dot:giga --inet4-only -O sv-bin-x64.zip $mirror/sv-bin-x64.zip
else
wget --inet4-only -O sv-bin-x86.zip $mirror/sv-bin-x86.zip
wget --progress=dot:giga --inet4-only -O sv-bin-x86.zip $mirror/sv-bin-x86.zip
fi

# Terminate installation if not all packages were downloaded
Expand Down
4 changes: 2 additions & 2 deletions scripts/update_configs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ echo
# Download nquake.ini
mkdir tmp
cd tmp
wget --inet4-only -q -O nquake.ini https://raw.githubusercontent.com/nQuake/client-win32/master/etc/nquake.ini
wget --progress=dot:giga --inet4-only -q -O nquake.ini https://raw.githubusercontent.com/nQuake/client-win32/master/etc/nquake.ini
if [ -s "nquake.ini" ]
then
echo foo >> /dev/null
Expand Down Expand Up @@ -61,7 +61,7 @@ echo

# Download maps
echo "=== Downloading ==="
wget --inet4-only -O sv-configs.zip $mirror/sv-configs.zip
wget --progress=dot:giga --inet4-only -O sv-configs.zip $mirror/sv-configs.zip

# Terminate installation if not all packages were downloaded
if [ -s "sv-configs.zip" ]
Expand Down
8 changes: 4 additions & 4 deletions scripts/update_maps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ echo
# Download nquake.ini
mkdir -p tmp
cd tmp
wget --inet4-only -q -O nquake.ini https://raw.githubusercontent.com/nQuake/client-win32/master/etc/nquake.ini
wget --progress=dot:giga --inet4-only -q -O nquake.ini https://raw.githubusercontent.com/nQuake/client-win32/master/etc/nquake.ini
if [ -s "nquake.ini" ]
then
echo foo >> /dev/null
Expand Down Expand Up @@ -61,12 +61,12 @@ echo

# Download maps
echo "=== Downloading ==="
wget --inet4-only -O sv-maps.zip $mirror/sv-maps.zip
wget --progress=dot:giga --inet4-only -O sv-maps.zip $mirror/sv-maps.zip
if [ -s "sv-maps.zip" ]
then
if [ "$(du sv-maps.zip | cut -f1)" \> "0" ]
then
wget --inet4-only -O sv-maps-gpl.zip $mirror/sv-maps-gpl.zip
wget --progress=dot:giga --inet4-only -O sv-maps-gpl.zip $mirror/sv-maps-gpl.zip
fi
fi

Expand Down Expand Up @@ -96,7 +96,7 @@ echo -n "* Extracting GPL maps..."
unzip -qqo sv-maps-gpl.zip 2> /dev/null;echo "done"

echo -n "* Downloading core maps..."
wget -P qw/maps -r --no-parent -N -nd -A "*.bsp" -A "*.ent" https://maps.quakeworld.nu/core/
wget --progress=dot:giga -P qw/maps -r --no-parent -N -nd -A "*.bsp" -A "*.ent" https://maps.quakeworld.nu/core/

echo -n "* Setting permissions..."
chmod 644 qw/maps/* 2> /dev/null
Expand Down
4 changes: 2 additions & 2 deletions src/install_nquakesv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,9 @@ nqiecho() {

nqwget() {
[ -n "${quiet}" ] && {
wget -q $* >/dev/null 2>&1
wget -q --progress=dot:giga $* >/dev/null 2>&1
} || {
wget $*
wget --progress=dot:giga $*
}
}

Expand Down