From 2cfb985441595ac47d15d4aacff15a7a707fb589 Mon Sep 17 00:00:00 2001 From: filux Date: Mon, 25 Jan 2016 23:52:51 +0100 Subject: [PATCH] fix for missing 'others' directory --- mk/linux/makedata.sh | 6 ++++++ mk/linux/start_megaglest_gameserver | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mk/linux/makedata.sh b/mk/linux/makedata.sh index fb4b1af9..1cdfea20 100755 --- a/mk/linux/makedata.sh +++ b/mk/linux/makedata.sh @@ -75,6 +75,12 @@ mkdir -p "$RELEASEDIR/tutorials/" cd "$RELEASEDIR/tutorials/" git archive --remote ${REPODIR}/data/glest_game/ HEAD:tutorials | tar x +echo "Exporting files from 'others' directory ..." +cd "$RELEASEDIR" +mkdir -p "$RELEASEDIR/others/" +cd "$RELEASEDIR/others/" +git archive --remote ${REPODIR}/data/glest_game/ HEAD:others | tar x + echo "Removing non required files ..." cd "$CURRENTDIR" # START diff --git a/mk/linux/start_megaglest_gameserver b/mk/linux/start_megaglest_gameserver index 0e7db801..72a6aebd 100755 --- a/mk/linux/start_megaglest_gameserver +++ b/mk/linux/start_megaglest_gameserver @@ -32,7 +32,7 @@ LANG=C trap "kill -- -$$" HUP INT QUIT TERM EXIT KERNEL="$(uname -s | tr '[A-Z]' '[a-z]')" -if [ "$(echo "$(readlink -f "$0" >/dev/null 2>&1; echo $?)" | grep '^[0-9]$')" -eq "0" ]; then +if [ "$KERNEL" = "linux" ] || [ "$(echo "$(readlink -f "$0" >/dev/null 2>&1; echo $?)" | grep '^[0-9]$')" -eq "0" ]; then GAMEDIR="$(dirname "$(readlink -f "$0")")" else GAMEDIR="$(cd "$(dirname "$0")"; pwd)"