mirror of
https://github.com/geometer/FBReaderJ.git
synced 2025-10-03 09:49:19 +02:00
fixed version detection
Conflicts: scripts/packageTool.sh
This commit is contained in:
parent
4fef954981
commit
fe1fb50394
1 changed files with 7 additions and 5 deletions
|
@ -32,10 +32,12 @@ updateVersion() {
|
||||||
minor=`echo $fixed | cut -d . -f 2`
|
minor=`echo $fixed | cut -d . -f 2`
|
||||||
micro=`echo $fixed | cut -d . -f 3`
|
micro=`echo $fixed | cut -d . -f 3`
|
||||||
local=`echo $fixed | cut -d . -f 4`
|
local=`echo $fixed | cut -d . -f 4`
|
||||||
if [ "$branch" == "nook" ]; then
|
if [ "$branch" == "nook" -o "$branch" == "lr-nook" ]; then
|
||||||
version=$version-nst
|
readable_version=$version-nst
|
||||||
elif [ "$branch" == "kindle" ]; then
|
elif [ "$branch" == "kindle" -o "$branch" == "lr-kindle" ]; then
|
||||||
version=$version-kindlehd
|
readable_version=$version-kindlehd
|
||||||
|
else
|
||||||
|
readable_version=$version
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$micro" == "" ]; then
|
if [ "$micro" == "" ]; then
|
||||||
|
@ -49,7 +51,7 @@ updateVersion() {
|
||||||
local=0
|
local=0
|
||||||
fi
|
fi
|
||||||
intversion=$((1000000*$major+10000*$minor+100*$micro+10*$variant+$local))
|
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() {
|
buildSourceArchive() {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue