diff --git a/scripts/packageTool.sh b/scripts/packageTool.sh index 88456bb44..bbeee634d 100755 --- a/scripts/packageTool.sh +++ b/scripts/packageTool.sh @@ -32,10 +32,12 @@ updateVersion() { minor=`echo $fixed | cut -d . -f 2` micro=`echo $fixed | cut -d . -f 3` local=`echo $fixed | cut -d . -f 4` - if [ "$branch" == "nook" ]; then - version=$version-nst - elif [ "$branch" == "kindle" ]; then - version=$version-kindlehd + if [ "$branch" == "nook" -o "$branch" == "lr-nook" ]; then + readable_version=$version-nst + elif [ "$branch" == "kindle" -o "$branch" == "lr-kindle" ]; then + readable_version=$version-kindlehd + else + readable_version=$version fi if [ "$micro" == "" ]; then @@ -49,7 +51,7 @@ updateVersion() { local=0 fi intversion=$((1000000*$major+10000*$minor+100*$micro+10*$variant+$local)) - sed "s/@INTVERSION@/$intversion/" AndroidManifest.xml.pattern | sed "s/@VERSION@/$version/" > AndroidManifest.xml + sed "s/@INTVERSION@/$intversion/" AndroidManifest.xml.pattern | sed "s/@VERSION@/$readable_version/" > AndroidManifest.xml } buildSourceArchive() {