From 64255f5a7f2e928325d4df5d108a66437e886065 Mon Sep 17 00:00:00 2001 From: Nicolas Raoul Date: Wed, 18 Jul 2012 13:25:57 +0900 Subject: [PATCH] Fixed script for cases where prefix is empty --- tools/release.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/release.sh b/tools/release.sh index 1b30e521e1..760ea97850 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -6,13 +6,16 @@ # If no option given, will guess the next version number. # Suffix configuration -#SUFFIX="" -SUFFIX="-EXPERIMENTAL" +SUFFIX="" +#SUFFIX="-EXPERIMENTAL" set -x # Version number to use -PREVIOUS_VERSION=`grep android:versionName AndroidManifest.xml | sed -e 's/.*="//' | sed -e 's/".*//' | sed -e "s/$SUFFIX//g"` +PREVIOUS_VERSION=`grep android:versionName AndroidManifest.xml | sed -e 's/.*="//' | sed -e 's/".*//'` +if [ -n "$SUFFIX" ]; then + PREVIOUS_VERSION=`echo $PREVIOUS_VERSION | sed -e "s/$SUFFIX//g"` +fi GUESSED_VERSION=`echo $PREVIOUS_VERSION | gawk -f tools/lib/increase-version.awk` VERSION=${1:-$GUESSED_VERSION$SUFFIX}