From a43d303eb78282b841208a5fe267d91b5a68f59e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Fri, 1 May 2015 09:59:24 +0200 Subject: [PATCH] use curl everywhere to run out of the box on Mac --- packaging/osx/buildpackage.sh | 2 +- packaging/package-all.sh | 4 ++-- thirdparty/fetch-thirdparty-deps.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packaging/osx/buildpackage.sh b/packaging/osx/buildpackage.sh index 98ac5ef34d..102bdcae59 100755 --- a/packaging/osx/buildpackage.sh +++ b/packaging/osx/buildpackage.sh @@ -14,7 +14,7 @@ if [ -e "OpenRA.app" ]; then exit 2 fi -wget https://github.com/OpenRA/OpenRALauncherOSX/releases/download/${LAUNCHER_TAG}/launcher.zip || exit 3 +curl -s -L -O https://github.com/OpenRA/OpenRALauncherOSX/releases/download/${LAUNCHER_TAG}/launcher.zip || exit 3 unzip launcher.zip rm launcher.zip diff --git a/packaging/package-all.sh b/packaging/package-all.sh index 2c245a6e54..e5297df063 100755 --- a/packaging/package-all.sh +++ b/packaging/package-all.sh @@ -22,9 +22,9 @@ make package find . -path "*.mdb" -delete test -e Changelog.md && rm Changelog.md -wget https://raw.githubusercontent.com/wiki/OpenRA/OpenRA/Changelog.md +curl -s -L -O https://raw.githubusercontent.com/wiki/OpenRA/OpenRA/Changelog.md -wget http://daringfireball.net/projects/downloads/Markdown_1.0.1.zip +curl -s -L -O http://daringfireball.net/projects/downloads/Markdown_1.0.1.zip unzip Markdown_1.0.1.zip rm -rf Markdown_1.0.1.zip ./Markdown_1.0.1/Markdown.pl Changelog.md > CHANGELOG.html diff --git a/thirdparty/fetch-thirdparty-deps.sh b/thirdparty/fetch-thirdparty-deps.sh index 821f5f4a5d..acf263d699 100755 --- a/thirdparty/fetch-thirdparty-deps.sh +++ b/thirdparty/fetch-thirdparty-deps.sh @@ -75,10 +75,10 @@ fi if [ ! -f SDL2-CS.dll ]; then echo "Fetching SDL2-CS from GitHub." - wget https://github.com/OpenRA/SDL2-CS/releases/download/20140407/SDL2-CS.dll + curl -s -L -O https://github.com/OpenRA/SDL2-CS/releases/download/20140407/SDL2-CS.dll fi if [ ! -f Eluant.dll ]; then echo "Fetching Eluant from GitHub." - wget https://github.com/OpenRA/Eluant/releases/download/20140425/Eluant.dll + curl -s -L -O https://github.com/OpenRA/Eluant/releases/download/20140425/Eluant.dll fi