commit 9579237949269ef391e474f222011fa218608fae Author: Nicolas Vigier boklm@torproject.org Date: Mon Nov 25 17:25:29 2019 +0100

fixup! Bug 4234: Use the Firefox Update Process for Tor Browser.

Bug 32498: Update MAR_CHANNEL_ID for nightly

We also add the -alpha channel ID to the list of ACCEPTED_MAR_CHANNEL_IDS for the alpha, so that we can change the alpha channel name at some point. --- browser/confvars.sh | 9 +++++++++ 1 file changed, 9 insertions(+)

diff --git a/browser/confvars.sh b/browser/confvars.sh index 428adaf6bcbc..adf45362014a 100755 --- a/browser/confvars.sh +++ b/browser/confvars.sh @@ -33,6 +33,15 @@ MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384} if test "$MOZ_UPDATE_CHANNEL" = "aurora"; then ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-aurora MAR_CHANNEL_ID=firefox-mozilla-aurora +elif test "$MOZ_UPDATE_CHANNEL" = "alpha"; then + # alpha is currently using the -release channel id. However we accept + # both -alpha and -release channel ID for the alpha so that we can + # switch it to -alpha at some point. See bug 32498. + ACCEPTED_MAR_CHANNEL_IDS=torbrowser-torproject-alpha,torbrowser-torproject-release + MAR_CHANNEL_ID=torbrowser-torproject-release +elif test "$MOZ_UPDATE_CHANNEL" = "nightly"; then + ACCEPTED_MAR_CHANNEL_IDS=torbrowser-torproject-nightly + MAR_CHANNEL_ID=torbrowser-torproject-nightly else ACCEPTED_MAR_CHANNEL_IDS=torbrowser-torproject-release MAR_CHANNEL_ID=torbrowser-torproject-release