From d3ca58211f8c767ba3a43aa0e0bf1e1830f19a19 Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Sun, 8 Apr 2018 11:38:36 -0400 Subject: [PATCH] Allow wget arguments for install-templates to be overridden --- .gitlab-ci.yml | 2 +- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b34fa2e..9aa5e8e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,7 @@ job make exports: - unzip godot3-server.zip - mv Godot_v3.0.2-stable_linux_server.64 bin/godot3-server - chmod +x bin/godot3-server - - make install-templates + - WGET_ARGS='' make install-templates script: - GODOT=./bin/godot3-server make export-all artifacts: diff --git a/Makefile b/Makefile index f7d3dcf..2125b47 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ TARGET_HTML5?=HTML5 TARGET_WINDOWS?=Windows Desktop TARGET_MACOSX?=Mac OSX TARGET_LINUX?=Linux/X11 - +WGET_ARGS?=-q build-dir: mkdir -p "$(BUILD_DIR)" @@ -38,7 +38,7 @@ export-linux: build-dir install-templates: mkdir -p "$(GODOT_TEMPLATE_DIR)" - wget -q $(EXPORT_TEMPLATE_SOURCE) -O templates.tpz + wget $(WGET_ARGS) $(EXPORT_TEMPLATE_SOURCE) -O templates.tpz unzip templates.tpz mv templates/ "$(GODOT_TEMPLATE_DIR)/$(GODOT_TEMPLATE_VERSION)" rm templates.tpz