summaryrefslogtreecommitdiffstats
path: root/wiki/src/contribute/release_process/tor-browser.mdwn
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2015-03-07 12:12:20 +0000
committerintrigeri <intrigeri@boum.org>2015-03-07 12:12:20 +0000
commit336bf4568ea3be0229844b54825730ce4cd34cc1 (patch)
tree08b393c3facb3787befce5052a427c271dd9e373 /wiki/src/contribute/release_process/tor-browser.mdwn
parent0574dda489bf959a5541564a29939469c0e50ac0 (diff)
Document how to import Tor Browser tarballs by content, instead of by (URL) reference.
Closes: #9020
Diffstat (limited to 'wiki/src/contribute/release_process/tor-browser.mdwn')
-rw-r--r--wiki/src/contribute/release_process/tor-browser.mdwn41
1 files changed, 33 insertions, 8 deletions
diff --git a/wiki/src/contribute/release_process/tor-browser.mdwn b/wiki/src/contribute/release_process/tor-browser.mdwn
index 53541ff..c409f9f 100644
--- a/wiki/src/contribute/release_process/tor-browser.mdwn
+++ b/wiki/src/contribute/release_process/tor-browser.mdwn
@@ -115,25 +115,50 @@ To synchronize your local git-annex metadata with the remote, run:
git annex sync
-Import a new set of Tor Browser tarballs
-----------------------------------------
+Set up environment variables
+----------------------------
-1. Make `TAILS_GIT_REPO` point to the main Tails Git repository
+1. Make sure you still have the environment variables defined in the
+ previous section set.
+
+2. Make `TAILS_GIT_REPO` point to the main Tails Git repository
checkout where `tbb-dist-url.txt` is being worked on, for example:
TAILS_GIT_REPO="$HOME/tails/git"
-2. Tell git-annex to record each tarball's URL into Git:
+3. Make `TORBROWSER_ARCHIVE` point to your local git annex working
+ copy of our Tor Browser archive, for example:
+
+ TORBROWSER_ARCHIVE="$HOME/tails/torbrowser-archive"
- cat "${TAILS_GIT_REPO}/config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt" | \
- while read expected_sha256 tarball; do
- git annex addurl --fast --pathdepth=-2 \
- "$(cat "${TAILS_GIT_REPO}/config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt")/${VERSION}/${tarball}"
+Import a new set of Tor Browser tarballs
+----------------------------------------
+
+1. Download and verify all the tarballs we need:
+
+ TMPDIR=$(mktemp -d)
+ CHROOT_INCLUDES="${TAILS_GIT_REPO}/config/chroot_local-includes"
+ TBB_SHA256SUMS_FILE="${CHROOT_INCLUDES}/usr/share/tails/tbb-sha256sums.txt"
+ TBB_DIST_URL_FILE="${CHROOT_INCLUDES}/usr/share/tails/tbb-dist-url.txt"
+ TBB_TARBALLS_BASE_URL="$(cat "${TBB_DIST_URL_FILE}")/${VERSION}"
+ cat "$TBB_SHA256SUMS_FILE" | while read expected_sha256 tarball; do
+ (
+ cd "$TMPDIR"
+ curl --remote-name "${TBB_TARBALLS_BASE_URL}/${tarball}"
+ )
done
+ (cd "$TMPDIR" && sha256sum -c "$TBB_SHA256SUMS_FILE")
+
+3. Move the tarballs into your local Git annex:
+
+ cd "$TORBROWSER_ARCHIVE" && \
+ mkdir "$VERSION" && cd "$VERSION" && \
+ git annex add "$TMPDIR/"*
Commit and push your changes
----------------------------
+ cd "$TORBROWSER_ARCHIVE" && \
git commit -m "Add Tor Browser ${VERSION}." && \
git annex sync && \
git annex copy --to origin