fix another relative path
This commit is contained in:
parent
2bf1d3a128
commit
1633507e95
|
@ -22,19 +22,19 @@ INFO_PLIST="${TARGET_BUILD_DIR}/${INFOPLIST_PATH}"
|
||||||
if [[ $(git ls-files -m "StatusIm/Info.plist") = *"Info.plist"* ]]; then
|
if [[ $(git ls-files -m "StatusIm/Info.plist") = *"Info.plist"* ]]; then
|
||||||
echo "version was set in Info.plist"
|
echo "version was set in Info.plist"
|
||||||
else
|
else
|
||||||
pwd
|
RELEASE_VERSION=$(cat ../VERSION)
|
||||||
# Build version (closest-tag-or-branch "-" commits-since-tag "-" short-hash dirty-flag)
|
# 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]]")
|
# 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.<commit count>
|
# or if there are no tags, we make up version 0.0.<commit count>
|
||||||
LATEST_TAG=$(cat ../VERSION) || LATEST_TAG="HEAD"
|
LATEST_TAG=${RELEASE_VERSION} || LATEST_TAG="HEAD"
|
||||||
if [ $LATEST_TAG = "HEAD" ]
|
if [ $LATEST_TAG = "HEAD" ]
|
||||||
then COMMIT_COUNT=$(git rev-list --count HEAD)
|
then COMMIT_COUNT=$(git rev-list --count HEAD)
|
||||||
LATEST_TAG="0.0.$COMMIT_COUNT"
|
LATEST_TAG="0.0.$COMMIT_COUNT"
|
||||||
COMMIT_COUNT_SINCE_TAG=0
|
COMMIT_COUNT_SINCE_TAG=0
|
||||||
else
|
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}..)
|
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
|
LATEST_TAG=${LATEST_TAG##v} # Remove the "v" from the front of the tag
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue