[tor-commits] [tor-browser-build/master] Bug 25405: cannot use Moat if a meek bridge is configured

[gk at torproject.org]

commit 98da9295f4f97a022c7131de7234893d0a6293de
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Mon Mar 26 21:10:44 2018 +0000

    Bug 25405: cannot use Moat if a meek bridge is configured
    
    When doing Moat things, use a separate profile for the secondary browser
    (instead of trying to use the main meek helper profile).
---
 projects/tor-browser/build | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/projects/tor-browser/build b/projects/tor-browser/build
index 5456ad1..7211841 100644
--- a/projects/tor-browser/build
+++ b/projects/tor-browser/build
@@ -34,6 +34,7 @@ touch "$GENERATEDPREFSPATH"
   EXTSPATH=TorBrowser/Data/Browser/profile.default/extensions
   TORCONFIGPATH=TorBrowser/Data/Tor
   MEEKPROFILEPATH=TorBrowser/Data/Browser/profile.meek-http-helper
+  MOATPROFILEPATH=TorBrowser/Data/Browser/profile.moat-http-helper
 
   mkdir -p "$TBDIR/TorBrowser/Data/Browser/Caches"
 [% END %]
@@ -144,6 +145,13 @@ cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> "$TBDIR/$MEEKPROFILEPATH/u
   popd
 [% END %]
 
+# For platforms for which we need to ship a Moat helper profile in addition
+# to a meek one, create it by duplicating the meek one that we just finished
+# creating.
+if [ ! -z "$MOATPROFILEPATH" ]; then
+  cp -pR $TBDIR/$MEEKPROFILEPATH $TBDIR/$MOATPROFILEPATH
+fi
+
 [% IF ! c("var/multi_lingual") %]
   echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> "$GENERATEDPREFSPATH"
 [% END %]