use curl which is always available on osx rather than wget

This commit is contained in:
nhmall
2019-11-24 13:37:22 -05:00
parent a9f33df64a
commit c1dd898df6
2 changed files with 18 additions and 8 deletions

2
.gitignore vendored
View File

@@ -71,7 +71,7 @@ dat/NHTILES.BMP
dat/msdoshlp.txt
src/host_o/
util/djgpp-linux64-gcc550.tar.bz2
util/djgpp-linux64-gcc550.tar.bz2
util/djgpp-osx-gcc550.tar.bz2
util/djgpp-mingw-gcc550-standalone.zip
util/dlb_main
util/thintile

View File

@@ -1,5 +1,5 @@
#!/bin/sh
set -x
if [ -z "$TRAVIS_BUILD_DIR" ]; then
export DJGPP_TOP=$(pwd)/djgpp
else
@@ -27,7 +27,12 @@ DJGPP_URL="$DJGPP_URL$DJGPP_FILE"
cd util
if [ ! -f "$DJGPP_FILE" ]; then
wget --no-hsts "$DJGPP_URL"
if [ "$(uname)" = "Darwin" ]; then
#Mac
curl -L $DJGPP_URL -o $DJGPP_FILE
else
wget --no-hsts "$DJGPP_URL"
fi
fi
cd ../
@@ -50,12 +55,17 @@ fi
# DOS-extender for use with djgpp
cd djgpp
if [ ! -d cwsdpmi ]; then
if [ "$(uname)" = "Darwin" ]; then
#Mac
curl http://sandmann.dotster.com/cwsdpmi/csdpmi7b.zip -o csdpmi7b.zip
else
wget --no-hsts http://sandmann.dotster.com/cwsdpmi/csdpmi7b.zip
mkdir -p cwsdpmi
cd cwsdpmi
unzip ../csdpmi7b.zip
cd ../
rm csdpmi7b.zip
fi
mkdir -p cwsdpmi
cd cwsdpmi
unzip ../csdpmi7b.zip
cd ../
rm csdpmi7b.zip
fi
cd ../