diff options
author | Justin R. Miller <incanus@codesorcery.net> | 2015-10-01 14:23:23 -0700 |
---|---|---|
committer | Justin R. Miller <incanus@codesorcery.net> | 2015-10-01 15:26:47 -0700 |
commit | a0244601ca4f94b5002cb0b14836bec1950b1644 (patch) | |
tree | 0da9cda9979c54a45a1d4a0c36e21111030dcf09 | |
parent | 212c7ed8da899034561b94bbf0c962644d2885ff (diff) | |
download | qtlocation-mapboxgl-a0244601ca4f94b5002cb0b14836bec1950b1644.tar.gz |
[ios] patch up iOS version-deducing scripts
-rwxr-xr-x | ios/docs/install_docs.sh | 6 | ||||
-rwxr-xr-x | scripts/ios/package.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ios/docs/install_docs.sh b/ios/docs/install_docs.sh index 99f2a5d1e9..20d78748fa 100755 --- a/ios/docs/install_docs.sh +++ b/ios/docs/install_docs.sh @@ -7,8 +7,8 @@ fi OUTPUT="/tmp/`uuidgen`" -VERSION=$( git tag --sort -v:refname | grep -v '\-rc.' | sed -n '1p' | sed 's/^v//' ) -echo "Creating new docs for ${VERSION}..." +DOCS_VERSION=$( git tag | grep ^ios | sed 's/^ios-//' | sort -r | grep -v '\-rc.' | grep -v '\-pre.' | sed -n '1p' | sed 's/^v//' ) +echo "Creating new docs for ${DOCS_VERSION}..." echo rm -rf /tmp/mbgl @@ -26,7 +26,7 @@ perl \ /tmp/mbgl/ios/*.h appledoc \ --output ${OUTPUT} \ - --project-name "Mapbox iOS SDK ${VERSION}" \ + --project-name "Mapbox iOS SDK ${DOCS_VERSION}" \ --project-company Mapbox \ --create-docset \ --company-id com.mapbox \ diff --git a/scripts/ios/package.sh b/scripts/ios/package.sh index 2b1e97c304..96e5f2ad9d 100755 --- a/scripts/ios/package.sh +++ b/scripts/ios/package.sh @@ -111,7 +111,7 @@ if [ -z `which appledoc` ]; then fi DOCS_OUTPUT="${OUTPUT}/static/Docs" git fetch --tags -DOCS_VERSION=$( git tag | sed 's/^ios-//' | sort -r | grep -v '\-rc.' | grep -v '\-pre.' | sed -n '1p' | sed 's/^v//' ) +DOCS_VERSION=$( git tag | grep ^ios | sed 's/^ios-//' | sort -r | grep -v '\-rc.' | grep -v '\-pre.' | sed -n '1p' | sed 's/^v//' ) rm -rf /tmp/mbgl mkdir -p /tmp/mbgl/ README=/tmp/mbgl/README.md |