From 9e8483bb240f13ea50881d51a2a854e3fc027011 Mon Sep 17 00:00:00 2001 From: mathusummut Date: Sun, 4 Nov 2018 00:14:51 +0100 Subject: [PATCH] Test build-zg fix --- mk/linux/build-zg.sh | 7 +++++-- mk/linux/zg_shared.sh | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mk/linux/build-zg.sh b/mk/linux/build-zg.sh index e55ab3d22..90606fb5b 100755 --- a/mk/linux/build-zg.sh +++ b/mk/linux/build-zg.sh @@ -4,6 +4,8 @@ # Written by Mark Vejvoda # Copyright (c) 2011-2013 Mark Vejvoda under GNU GPL v3.0+ +./setupBuildDeps.sh + # ---------------------------------------------------------------------------- # # Configuration section @@ -317,13 +319,14 @@ else if [ $? -ne 0 ]; then echo 'ERROR: MAKE failed.' >&2; exit 2 fi - + + git clone https://github.com/ZetaGlest/zetaglest-data.git cd .. echo '' echo 'BUILD COMPLETE.' echo '' echo 'To launch ZetaGlest from the current directory, use:' - echo ' ./zetaglest' + echo ' ./build/zetaglest' #echo 'Or change into mk/linux and run it from there:' #echo ' ./zetaglest --ini-path=./ --data-path=./' fi diff --git a/mk/linux/zg_shared.sh b/mk/linux/zg_shared.sh index d08d1d8c7..d8e4faa75 100644 --- a/mk/linux/zg_shared.sh +++ b/mk/linux/zg_shared.sh @@ -2,7 +2,7 @@ # # Functions shared by several scripts # -# Copyright (c) 2013-2016 MegaGlest Team under GNU GPL v3.0+ +# Copyright (c) 2013-2018 ZetaGlest Team under GNU GPL v3.0+ function detect_system { # Determine distro title, release, codename