commit 62f2dced863d2dfcd5076c101bda0f4c9c10d508 Author: Georg Koppen gk@torproject.org Date: Tue Jan 16 15:09:41 2018 +0000
Bug 24912: Don't build the macOS sandbox in the stable series --- projects/tor-browser/build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/projects/tor-browser/build b/projects/tor-browser/build index bfa250a..59fbda5 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -106,13 +106,14 @@ tar -C $TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %] -xf [% c('input_files_b rm -Rf Bundle-Data/mac mv $SKELETON_TMP Bundle-Data/mac
- # Install a "tor" shim that sets the working directory. See #10030. mv $TBDIR/$TORBINPATH/tor $TBDIR/$TORBINPATH/tor.real cp Bundle-Data/mac-tor.sh $TBDIR/$TORCONFIGPATH/tor
- SANDBOX_FOLDER="$TB_STAGE_DIR/Sandboxed Tor Browser" - mv Bundle-Data/mac-sandbox "$SANDBOX_FOLDER" + [% IF ! c("var/release") -%] + SANDBOX_FOLDER="$TB_STAGE_DIR/Sandboxed Tor Browser" + mv Bundle-Data/mac-sandbox "$SANDBOX_FOLDER" + [% END -%]
tar -C Bundle-Data/mac-applications.dmg -c . | tar -C $TB_STAGE_DIR -x [% END %]
tbb-commits@lists.torproject.org