From f86210f5dad33c854e847912f605542bcd07e801 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Thu, 4 May 2017 14:30:50 -0400 Subject: [PATCH] Ability to handle versions without suffix after platform. --- platform-darwin/Scripts/updatePlist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform-darwin/Scripts/updatePlist b/platform-darwin/Scripts/updatePlist index 3fa26f5e..128fcb7b 100755 --- a/platform-darwin/Scripts/updatePlist +++ b/platform-darwin/Scripts/updatePlist @@ -41,9 +41,9 @@ case $PLATFORM_NAME in *) ftl 'ERROR: Unknown platform: %s.' "$PLATFORM_NAME"; exit 1 ;; esac -description=$(git describe --always --dirty --long --match "*-$platform-*") +description=$(git describe --always --dirty --long --match "*-$platform*") version=${description%-g*} build=${version##*-} version=${version%-$build} -version=${version//-*-/.} release=${version%%-*} commit=${description##*-g} +version=${version//-$platform/} version=${version//-/.} commit=${description##*-g} addPlistWithKey GITDescription string "$description" setPlistWithKey CFBundleVersion "$(hr "${version%%.*}" 14).${version#*.}"