Bug 1100750 - Handle developer usernames that contain dashes. r=nalexander
authorRichard Newman <rnewman@mozilla.com>
Tue, 18 Nov 2014 10:38:18 -0800
changeset 228258 e7a7c9c5dfe770af5b89828b63db9e011eef32ff
parent 228257 240df159e2386b9374b3c38a47ba7ce07a866ccc
child 228259 3457abba4f2ae9584f7ca22e1ca5a3d6084db7ff
child 228312 790c27c395af52c04429fa4a5b1348dc31a19d42
push id98
push userahalberstadt@mozilla.com
push dateWed, 19 Nov 2014 19:40:37 +0000
reviewersnalexander
bugs1100750
milestone36.0a1
Bug 1100750 - Handle developer usernames that contain dashes. r=nalexander
b2g/branding/unofficial/configure.sh
mobile/android/branding/unofficial/configure.sh
--- a/b2g/branding/unofficial/configure.sh
+++ b/b2g/branding/unofficial/configure.sh
@@ -1,7 +1,7 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-ANDROID_PACKAGE_NAME=org.mozilla.b2g_`echo $USER`
+ANDROID_PACKAGE_NAME=org.mozilla.b2g_`echo $USER | sed 's/-/_/g'`
 MOZ_APP_DISPLAYNAME=B2G
 MOZ_UPDATER=
--- a/mobile/android/branding/unofficial/configure.sh
+++ b/mobile/android/branding/unofficial/configure.sh
@@ -1,8 +1,8 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-ANDROID_PACKAGE_NAME=org.mozilla.fennec_`echo $USER`
-MOZ_APP_DISPLAYNAME="Fennec `echo $USER`"
+ANDROID_PACKAGE_NAME=org.mozilla.fennec_`echo $USER | sed 's/-/_/g'`
+MOZ_APP_DISPLAYNAME="Fennec `echo $USER | sed 's/-/_/g'`"
 MOZ_UPDATER=
 MOZ_ANDROID_ANR_REPORTER=