Merge PR #497: Fix a warning in the gradlew script

pull/499/head
Jenkins nymea 2021-01-08 22:15:53 +01:00
commit 281a97a32e
1 changed files with 5 additions and 5 deletions

View File

@ -1,9 +1,9 @@
#!/bin/sh
BASEDIR=$(dirname "$0")
MEA_VERSION=`cat $BASEDIR/../version.txt | head -n 1`
MEA_VERSION_CODE=`cat $BASEDIR/../version.txt | head -n 2 | tail -n 1`
echo "Setting version to $MEA_VERSION ($MEA_VERSION_CODE)"
sed -i "s/android:versionName=\"[0-9\.a-zA-Z$_]*\"/android:versionName=\"$MEA_VERSION\"/" AndroidManifest.xml
sed -i "s/android:versionCode=\"[0-9]*\"/android:versionCode=\"$MEA_VERSION_CODE\"/" AndroidManifest.xml
NYMEA_APP_VERSION=`cat $BASEDIR/../version.txt | head -n 1`
NYMEA_APP_VERSION_CODE=`cat $BASEDIR/../version.txt | head -n 2 | tail -n 1`
echo "Setting version to $NYMEA_APP_VERSION ($NYMEA_APP_VERSION_CODE)"
sed -i "s/android:versionName=\"[0-9\.a-zA-Z_]*\"/android:versionName=\"$NYMEA_APP_VERSION\"/" AndroidManifest.xml
sed -i "s/android:versionCode=\"[0-9]*\"/android:versionCode=\"$NYMEA_APP_VERSION_CODE\"/" AndroidManifest.xml
./gradlew.upstream $@