[tor-commits] [tor-browser-bundle/master] Bug 13245: Prevent non-english TBBs from upgrading to english version.

[mikeperry at torproject.org]

commit a92ec3e06a17f1a19c35590c8ad93081b180ef4e
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Thu Sep 25 19:05:59 2014 -0700

    Bug 13245: Prevent non-english TBBs from upgrading to english version.
---
 gitian/descriptors/linux/gitian-bundle.yml   |    6 ++++++
 gitian/descriptors/mac/gitian-bundle.yml     |    6 ++++++
 gitian/descriptors/windows/gitian-bundle.yml |    6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml
index 38882f3..d3b030c 100644
--- a/gitian/descriptors/linux/gitian-bundle.yml
+++ b/gitian/descriptors/linux/gitian-bundle.yml
@@ -183,6 +183,12 @@ script: |
     rm -rf defaults
     popd
 
+    # Set the update.locale (it is used to replace %LOCALE% within app.update.url).
+    pushd tor-browser_$LANG/Browser/
+    echo "$LANG" > update.locale
+    zip -Xm omni.ja update.locale
+    popd
+
     # Recreate precomplete file (needs to be accurate for full MAR updates).
     pushd tor-browser_$LANG/Browser
     rm -f precomplete
diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml
index 9801826..bd8bb5d 100644
--- a/gitian/descriptors/mac/gitian-bundle.yml
+++ b/gitian/descriptors/mac/gitian-bundle.yml
@@ -227,6 +227,12 @@ script: |
     rm -rf defaults
     popd
 
+    # Set the update.locale (it is used to replace %LOCALE% within app.update.url).
+    pushd ~/build/dmg/$DEST.app/Contents/MacOS/
+    echo "$LANG" > update.locale
+    zip -Xm omni.ja update.locale
+    popd
+
     if [ ${TORBROWSER_VERSION::3} == "3.5" ]; then
        pushd ~/build/dmg/
        ~/build/dzip.sh $OUTDIR/TorBrowserBundle-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_$LANG.zip $DEST.app
diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml
index 79d6340..2d50f9c 100644
--- a/gitian/descriptors/windows/gitian-bundle.yml
+++ b/gitian/descriptors/windows/gitian-bundle.yml
@@ -162,6 +162,12 @@ script: |
     rm -rf defaults
     popd
 
+    # Set the update.locale (it is used to replace %LOCALE% within app.update.url).
+    pushd "Tor Browser"/Browser/
+    echo "$LANG" > update.locale
+    zip -Xm omni.ja update.locale
+    popd
+
     # Recreate precomplete file (needs to be accurate for full MAR updates).
     pushd "Tor Browser"/Browser/
     rm -f precomplete