[tor-commits] [tor-browser-bundle/master] Bug 21879: Use our default bookmarks on OSX.

[gk at torproject.org]

commit 57f088b981a0292d5370b3c56c6d7e5a18f95aca
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Wed May 10 11:59:39 2017 -0400

    Bug 21879: Use our default bookmarks on OSX.
    
    Account for the changes Mozilla to support localized default bookmarks
    (see: https://bugzilla.mozilla.org/show_bug.cgi?id=1235107).
    Currently, Tor Browser uses the same bookmarks for all locales.
---
 gitian/descriptors/mac/gitian-bundle.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml
index 8c7bbfc..a2c8408 100644
--- a/gitian/descriptors/mac/gitian-bundle.yml
+++ b/gitian/descriptors/mac/gitian-bundle.yml
@@ -231,10 +231,11 @@ script: |
   unzip omni.ja defaults/preferences/000-tor-browser.js
   cp defaults/preferences/000-tor-browser.js ~/build/
   if [ "z$DATA_OUTSIDE_APP_DIR" = "z1" ]; then
-    # Embed our default bookmarks.
-    mkdir -p defaults/profile/
-    cp -p ~/build/bookmarks.html defaults/profile/
-    zip -Xm omni.ja defaults/profile/bookmarks.html
+    # Embed our default bookmarks within the en-US locale.
+    mkdir -p chrome/en-US/locale/browser
+    cp -p ~/build/bookmarks.html chrome/en-US/locale/browser/
+    zip -Xm omni.ja chrome/en-US/locale/browser/bookmarks.html
+    rm -rf chrome
   fi
   # Set the locale of the bundle.
   echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js
@@ -260,8 +261,8 @@ script: |
 
   unzip mac-langpacks.zip
   MAC_LOCALES="$BUNDLE_LOCALES $BUNDLE_LOCALES_MAC"
-  # Prepare our language packs for using the proper search engines. See bug
-  # 18915 for more details.
+  # Prepare our language packs for using the proper search engines and embed
+  # our default bookmarks. See bugs 18915 and 21879 for more details.
   for LANG in $MAC_LOCALES
   do
     xpi=mac-langpacks/$LANG.xpi
@@ -269,6 +270,7 @@ script: |
     search_plugins_path=prep_$LANG/browser/chrome/$LANG/locale/browser
     rm -rf $search_plugins_path/searchplugins
     cp -rf ~/build/searchplugins $search_plugins_path
+    cp ~/build/bookmarks.html prep_$LANG/browser/chrome/$LANG/locale/browser/
     rm $xpi
     cd prep_$LANG
     ~/build/dzip.sh ../$xpi .