[tor-commits] [tor-browser-bundle/master] Taking sandboxed-tor-browser tags into account

[gk at torproject.org]

commit 0b72179000a8f8e037027ecc5731e0824fbe4577
Author: Georg Koppen <gk at torproject.org>
Date:   Sun Dec 11 08:57:39 2016 +0000

    Taking sandboxed-tor-browser tags into account
---
 gitian/descriptors/linux/gitian-sandbox.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-sandbox.yml b/gitian/descriptors/linux/gitian-sandbox.yml
index 0c67126..c506833 100644
--- a/gitian/descriptors/linux/gitian-sandbox.yml
+++ b/gitian/descriptors/linux/gitian-sandbox.yml
@@ -26,6 +26,7 @@ remotes:
 - "url": "https://git.schwanenlied.me/yawning/sandboxed-tor-browser"
   "dir": "sandbox"
 files:
+- "versions"
 - "go-linux32-utils.zip"
 - "go-linux64-utils.zip"
 - "dzip.sh"
@@ -75,5 +76,11 @@ script: |
   cd ..
 
   cd $INSTDIR
-  ~/build/dzip.sh sandbox-linux$GBUILD_BITS.zip sandbox/
-  cp sandbox-linux$GBUILD_BITS.zip $OUTDIR/
+  if [ "$SANDBOX_TAG" = "master" ]
+  then
+    SB_TAG="master"
+  else
+    SB_TAG=${SANDBOX_TAG#sandboxed-tor-browser-}
+  fi
+  ~/build/dzip.sh sandbox-$SB_TAG-linux$GBUILD_BITS.zip sandbox/
+  cp sandbox-$SB_TAG-linux$GBUILD_BITS.zip $OUTDIR/