summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin R. Miller <incanus@codesorcery.net>2015-06-19 12:57:42 -0700
committerJustin R. Miller <incanus@codesorcery.net>2015-06-19 12:57:42 -0700
commit18d8d4475e9911086b52b1ca44dcbfab1f3a1bb6 (patch)
treee8a15cc45514e5c971121648679ea72d801dee0f
parent8f8fdaad88c8acf1b1a6df135f59de7888c94e21 (diff)
downloadqtlocation-mapboxgl-18d8d4475e9911086b52b1ca44dcbfab1f3a1bb6.tar.gz
avoid release candidates in determining version
-rwxr-xr-xios/docs/install_docs.sh2
-rwxr-xr-xscripts/ios/package.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/ios/docs/install_docs.sh b/ios/docs/install_docs.sh
index 44722dd63f..153d4e2093 100755
--- a/ios/docs/install_docs.sh
+++ b/ios/docs/install_docs.sh
@@ -7,7 +7,7 @@ fi
OUTPUT="/tmp/`uuidgen`"
-VERSION=$( git tag --sort -v:refname | sed -n '1p' | sed 's/^v//' )
+VERSION=$( git tag --sort -v:refname | grep -v '\-rc.' | sed -n '1p' | sed 's/^v//' )
echo "Creating new docs for ${VERSION}..."
echo
diff --git a/scripts/ios/package.sh b/scripts/ios/package.sh
index afb6584d5a..ac8d6e0928 100755
--- a/scripts/ios/package.sh
+++ b/scripts/ios/package.sh
@@ -109,7 +109,7 @@ if [ -z `which appledoc` ]; then
exit 1
fi
DOCS_OUTPUT="${OUTPUT}/static/Docs"
-DOCS_VERSION=$( git tag --sort -v:refname | sed -n '1p' | sed 's/^v//' )
+DOCS_VERSION=$( git tag --sort -v:refname | grep -v '\-rc.' | sed -n '1p' | sed 's/^v//' )
README="/tmp/GL-README.md"
cat ios/README.md | grep -v screenshot > ${README}
echo >> ${README}