[tor-commits] [tor-browser-build/master] Bug 24912: No sandboxed-tor-browser in the stable series yet

[gk at torproject.org]

commit 563ebc0ab77bbc7b0e792fa29317de9dab278c9d
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Jan 16 13:04:42 2018 +0000

    Bug 24912: No sandboxed-tor-browser in the stable series yet
---
 projects/release/build  | 4 +++-
 projects/release/config | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/projects/release/build b/projects/release/build
index 985ffa3..3940504 100644
--- a/projects/release/build
+++ b/projects/release/build
@@ -20,7 +20,9 @@ mkdir -p "$destdir"
 [% END -%]
 [% IF c("var/torbrowser-linux-x86_64") -%]
   mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/
-  mv [% c('input_files_by_name/sandbox-linux-x86_64') %] "$destdir"/sandbox-[% pc('sandbox', 'version') %]-linux64.zip
+  [% IF ! c("var/release") %]
+    mv [% c('input_files_by_name/sandbox-linux-x86_64') %] "$destdir"/sandbox-[% pc('sandbox', 'version') %]-linux64.zip
+  [% END %]
 [% END -%]
 cd "$destdir"
 cat > .htaccess <<EOF
diff --git a/projects/release/config b/projects/release/config
index f0d95c7..61c6175 100644
--- a/projects/release/config
+++ b/projects/release/config
@@ -85,7 +85,7 @@ input_files:
 
  - name: sandbox-linux-x86_64
    project: sandbox
-   enable: '[% c("var/torbrowser-linux-x86_64") %]'
+   enable: '[% c("var/torbrowser-linux-x86_64") && ! c("var/release") %]'
    target:
      - '[% c("var/build_target") %]'
      - torbrowser-linux-x86_64