[tor-commits] [tor-browser-bundle/master] Bug 21348: Make snowflake only available on Linux for now

[gk at torproject.org]

commit ff0756e4778736cb2e05f260bf277c20bcd2d31a
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Jan 30 14:25:18 2017 +0000

    Bug 21348: Make snowflake only available on Linux for now
---
 gitian/mkbundle-mac.sh     | 9 ++++++---
 gitian/mkbundle-windows.sh | 3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh
index 16140b1..3536553 100755
--- a/gitian/mkbundle-mac.sh
+++ b/gitian/mkbundle-mac.sh
@@ -56,12 +56,15 @@ $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/
 rm -f $GITIAN_DIR/inputs/TorBrowser.app.meek-http-helper.zip
 (cd PTConfigs/mac && $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/TorBrowser.app.meek-http-helper.zip TorBrowser.app.meek-http-helper)
 if [ "z$DATA_OUTSIDE_APP_DIR" = "z1" ]; then
-# FTE is temporarily disabled due to bug 18495.
+# FTE is temporarily disabled due to bug 18495 and snowflake is Linux-only for
+# now.
   grep -v 'fteproxy' PTConfigs/mac/torrc-defaults-appendix > $GITIAN_DIR/inputs/torrc-defaults-appendix-mac
-  grep -v 'default_bridge\.fte' PTConfigs/bridge_prefs.js > $GITIAN_DIR/inputs/bridge_prefs.js
+  grep -Ev 'default_bridge\.fte|default_bridge\.snowflake' PTConfigs/bridge_prefs.js > $GITIAN_DIR/inputs/bridge_prefs.js
 else
   cp PTConfigs/mac/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-mac
-  cp PTConfigs/bridge_prefs.js $GITIAN_DIR/inputs/
+  # We don't have snowflake available on macOS yet.
+  grep -v 'default_bridge\.snowflake' PTConfigs/bridge_prefs.js > $GITIAN_DIR/inputs/bridge_prefs.js
+
 fi
 cp PTConfigs/meek-http-helper-user.js $GITIAN_DIR/inputs/
 cp mac-tor.sh $GITIAN_DIR/inputs/
diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh
index 1afa840..6254937 100755
--- a/gitian/mkbundle-windows.sh
+++ b/gitian/mkbundle-windows.sh
@@ -55,7 +55,8 @@ cd $WRAPPER_DIR/../Bundle-Data/
 rm -f $GITIAN_DIR/inputs/tbb-docs.zip
 $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/
 cp PTConfigs/windows/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-windows
-cp PTConfigs/bridge_prefs.js $GITIAN_DIR/inputs/
+# We don't have snowflake available on Windows yet.
+grep -v 'default_bridge\.snowflake' PTConfigs/bridge_prefs.js > $GITIAN_DIR/inputs/bridge_prefs.js
 cp PTConfigs/meek-http-helper-user.js $GITIAN_DIR/inputs/
 
 cd windows