From f2b9a25198673885f72ba8f4391de6e12a3a6335 Mon Sep 17 00:00:00 2001 From: filux Date: Mon, 23 Feb 2015 19:10:32 +0100 Subject: [PATCH] support also for macos --- mk/linux/make-data-archive.sh | 31 +++++++++++++++++++++---------- mk/linux/mg-version.sh | 8 +++++++- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/mk/linux/make-data-archive.sh b/mk/linux/make-data-archive.sh index fcbef4ef..e966aff9 100755 --- a/mk/linux/make-data-archive.sh +++ b/mk/linux/make-data-archive.sh @@ -7,16 +7,26 @@ # Consider setting this for small packages if there's plenty of RAM and CPU available: #export XZ_OPT="$XZ_OPT -9e" +KERNEL="$(uname -s | tr '[A-Z]' '[a-z]')" +if [ "$KERNEL" = "darwin" ]; then + CURRENTDIR="$(cd "$(dirname "$0")"; pwd)" +else + CURRENTDIR="$(dirname "$(readlink -f "$0")")" +fi +cd "$CURRENTDIR" VERSION=`./mg-version.sh --version` RELEASENAME=megaglest-standalone-data PACKAGE="$RELEASENAME-$VERSION.tar.xz" -CURRENTDIR="$(dirname $(readlink -f $0))" -RELEASEDIR_ROOT="$CURRENTDIR/../../../release/" +RELEASEDIR_ROOT="$CURRENTDIR/../../../release" RELEASEDIR="${RELEASEDIR_ROOT}/${RELEASENAME-$VERSION}" PROJDIR="$CURRENTDIR/../../" REPODIR="$CURRENTDIR/../../" -echo "Creating data package in $RELEASEDIR" +if [ "$KERNEL" != "darwin" ]; then + echo "Creating data package in $RELEASEDIR" +else + echo "Creating data directory $RELEASEDIR" +fi [[ -d "$RELEASEDIR" ]] && rm -rf "$RELEASEDIR" mkdir -p "$RELEASEDIR" @@ -74,11 +84,12 @@ rm -rf "$RELEASEDIR/data/cegui" # END cd "$CURRENTDIR" -echo "creating data archive: $PACKAGE" -[[ -f "${RELEASEDIR_ROOT}/$PACKAGE" ]] && rm "${RELEASEDIR_ROOT}/$PACKAGE" -cd $RELEASEDIR -tar -cf - * | xz > ../$PACKAGE -cd $CURRENTDIR - -ls -la ${RELEASEDIR_ROOT}/$PACKAGE +if [ "$KERNEL" != "darwin" ]; then + echo "creating data archive: $PACKAGE" + [[ -f "${RELEASEDIR_ROOT}/$PACKAGE" ]] && rm "${RELEASEDIR_ROOT}/$PACKAGE" + cd $RELEASEDIR + tar -cf - * | xz > ../$PACKAGE + cd $CURRENTDIR + ls -la ${RELEASEDIR_ROOT}/$PACKAGE +fi diff --git a/mk/linux/mg-version.sh b/mk/linux/mg-version.sh index ef735ca7..53a0d3e0 100755 --- a/mk/linux/mg-version.sh +++ b/mk/linux/mg-version.sh @@ -4,7 +4,13 @@ # Written by Mark Vejvoda # Copyright (c) 2011 Mark Vejvoda under GNU GPL v3.0+ -VERSION_INFO_FILE="$(dirname "$(readlink -f "$0")")/../../source/version.txt" +KERNEL="$(uname -s | tr '[A-Z]' '[a-z]')" +if [ "$KERNEL" = "darwin" ]; then + CURRENTDIR="$(cd "$(dirname "$0")"; pwd)" +else + CURRENTDIR="$(dirname "$(readlink -f "$0")")" +fi +VERSION_INFO_FILE="$CURRENTDIR/../../source/version.txt" OLD_MG_VERSION="$(awk -F '=' '/^OldReleaseGameVersion =/ {print $2}' "$VERSION_INFO_FILE" | awk -F '"' '{print $2}')" OLD_MG_VERSION_BINARY="$OLD_MG_VERSION" MG_VERSION="$(awk -F '=' '/^CurrentGameVersion =/ {print $2}' "$VERSION_INFO_FILE" | awk -F '"' '{print $2}')"