From 1633507e95e10d720983538024c000fb08546586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Fri, 25 May 2018 00:11:18 +0200 Subject: [PATCH] fix another relative path --- ios/scripts/set_xcode_version.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ios/scripts/set_xcode_version.sh b/ios/scripts/set_xcode_version.sh index 69ef4bb515..d88d3dd2ae 100755 --- a/ios/scripts/set_xcode_version.sh +++ b/ios/scripts/set_xcode_version.sh @@ -22,19 +22,19 @@ INFO_PLIST="${TARGET_BUILD_DIR}/${INFOPLIST_PATH}" if [[ $(git ls-files -m "StatusIm/Info.plist") = *"Info.plist"* ]]; then echo "version was set in Info.plist" else - pwd + RELEASE_VERSION=$(cat ../VERSION) # Build version (closest-tag-or-branch "-" commits-since-tag "-" short-hash dirty-flag) - BUILD_VERSION="$(cat ../VERSION)-$(git describe --always --dirty=+)" + BUILD_VERSION="${RELEASE_VERSION}-$(git describe --always --dirty=+)" # Use the latest tag for short version (expected tag format "vn[.n[.n]]") # or if there are no tags, we make up version 0.0. - LATEST_TAG=$(cat ../VERSION) || LATEST_TAG="HEAD" + LATEST_TAG=${RELEASE_VERSION} || LATEST_TAG="HEAD" if [ $LATEST_TAG = "HEAD" ] then COMMIT_COUNT=$(git rev-list --count HEAD) LATEST_TAG="0.0.$COMMIT_COUNT" COMMIT_COUNT_SINCE_TAG=0 else - VERSION_CHANGE_COMMIT=$(git log -n 1 --pretty=format:%H -- ../../VERSION) + VERSION_CHANGE_COMMIT=$(git log -n 1 --pretty=format:%H -- ../VERSION) COMMIT_COUNT_SINCE_TAG=$(git rev-list --count ${VERSION_CHANGE_COMMIT}..) LATEST_TAG=${LATEST_TAG##v} # Remove the "v" from the front of the tag fi