yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-03 17:59:33 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into lr

Browse source 
Conflicts:
	scripts/packageTool.sh
This commit is contained in:
Nikolay Pultsin 2015-01-16 15:32:04 +00:00
commit 1439cc16ee
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scripts/packageTool.sh
View file

@ -33,9 +33,11 @@ updateVersion() {
micro=`echo $fixed | cut -d . -f 3`
local=`echo $fixed | cut -d . -f 4`
if [ "$branch" == "nook" -o "$branch" == "lr-nook" ]; then
version=$version-nst
readable_version=$version-nst
elif [ "$branch" == "kindle" -o "$branch" == "lr-kindle" ]; then
version=$version-kindlehd
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() {