From fa4c2257434dd93a47c0832dacf96494dfae2d7a Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Fri, 18 Oct 2019 11:41:41 -0700 Subject: [PATCH] "-" not allowed in packed names --- .travis.yml | 4 ++-- tools/update_android_version.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index fae7bc31f..e8a32d3fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -199,11 +199,11 @@ after_success: - cd ${TRAVIS_BUILD_DIR} # master development builds to beta track - - GOOGLE_PLAY_PKG=org.mavlink.qgroundcontrol-daily + - GOOGLE_PLAY_PKG=org.mavlink.qgroundcontroldaily - if [ "${TRAVIS_TAG}" ]; then GOOGLE_PLAY_PKG=org.mavlink.qgroundcontrol; elif [ "${TRAVIS_BRANCH}" = "master" ]; then - GOOGLE_PLAY_PKG=org.mavlink.qgroundcontrol-daily; + GOOGLE_PLAY_PKG=org.mavlink.qgroundcontroldaily; else GOOGLE_PLAY_PKG=none; fi diff --git a/tools/update_android_version.sh b/tools/update_android_version.sh index 6b7a6958a..f70b27076 100755 --- a/tools/update_android_version.sh +++ b/tools/update_android_version.sh @@ -13,7 +13,7 @@ MANIFEST_FILE=android/AndroidManifest.xml # manifest package if [ "$2" = "master" ]; then - QGC_PKG_NAME="org.mavlink.qgroundcontrol-daily" + QGC_PKG_NAME="org.mavlink.qgroundcontroldaily" sed -i -e 's/package *= *"[^"]*"/package="'$QGC_PKG_NAME'"/' $MANIFEST_FILE echo "Android package name: $QGC_PKG_NAME" fi -- 2.22.0