kienan
/
ld41-sim_shitty
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow wget arguments for install-templates to be overridden

This commit is contained in:
Kienan Stewart 2018-04-08 11:38:36 -04:00
parent 88ddac4ac4
commit d3ca58211f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -15,7 +15,7 @@ job make exports:
- unzip godot3-server.zip - unzip godot3-server.zip
- mv Godot_v3.0.2-stable_linux_server.64 bin/godot3-server - mv Godot_v3.0.2-stable_linux_server.64 bin/godot3-server
- chmod +x bin/godot3-server - chmod +x bin/godot3-server
- make install-templates - WGET_ARGS='' make install-templates
script: script:
- GODOT=./bin/godot3-server make export-all - GODOT=./bin/godot3-server make export-all
artifacts: artifacts:

4
Makefile
View File

@ -9,7 +9,7 @@ TARGET_HTML5?=HTML5
TARGET_WINDOWS?=Windows Desktop TARGET_WINDOWS?=Windows Desktop
TARGET_MACOSX?=Mac OSX TARGET_MACOSX?=Mac OSX
TARGET_LINUX?=Linux/X11 TARGET_LINUX?=Linux/X11
WGET_ARGS?=-q
build-dir: build-dir:
mkdir -p "$(BUILD_DIR)" mkdir -p "$(BUILD_DIR)"
@ -38,7 +38,7 @@ export-linux: build-dir
install-templates: install-templates:
mkdir -p "$(GODOT_TEMPLATE_DIR)" 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 unzip templates.tpz
mv templates/ "$(GODOT_TEMPLATE_DIR)/$(GODOT_TEMPLATE_VERSION)" mv templates/ "$(GODOT_TEMPLATE_DIR)/$(GODOT_TEMPLATE_VERSION)"
rm templates.tpz rm templates.tpz