From 5b3d3baa813d5b5aaa638bcc57626178b0462d60 Mon Sep 17 00:00:00 2001 From: filux Date: Mon, 16 Nov 2015 19:33:19 +0100 Subject: [PATCH] tiny fix for mac [ci skip] --- data/glest_game | 2 +- mk/macosx/make-binary-archive.sh | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/data/glest_game b/data/glest_game index 593b4588..df0c16f1 160000 --- a/data/glest_game +++ b/data/glest_game @@ -1 +1 @@ -Subproject commit 593b45885701827f068e567f8e926edeac5445c5 +Subproject commit df0c16f14351fedc47c93bdde06bd527ba7502d0 diff --git a/mk/macosx/make-binary-archive.sh b/mk/macosx/make-binary-archive.sh index b0de021d..2b9e3bf1 100755 --- a/mk/macosx/make-binary-archive.sh +++ b/mk/macosx/make-binary-archive.sh @@ -16,7 +16,7 @@ CURRENTDIR="$(cd "$(dirname "$0")"; pwd)" # Consider setting this for small packages if there's plenty of RAM and CPU available: #export XZ_OPT="$XZ_OPT -9e" -if [ "$1" = "-CI" ] || [ "$1" = "--show-result-path" ]; then +if [ "$1" = "-CI" ] || [ "$1" = "-" ] || [ "$1" = "--show-result-path" ]; then if [ "$2" != "" ]; then SOURCE_BRANCH="$2"; fi fi @@ -87,5 +87,7 @@ cd "$RELEASENAME" tar -cf - * | bzip2 -9 > "../$PACKAGE" cd "$CURRENTDIR" -if [ "$1" = "-CI" ] && [ -d "$RELEASEDIR" ]; then rm -rf "$RELEASEDIR"; fi +if [ "$1" = "-CI" ] || [ "$1" = "-" ]; then + if [ -d "$RELEASEDIR" ]; then rm -rf "$RELEASEDIR"; fi +fi ls -lhA "${RELEASEDIR_ROOT}/$PACKAGE"