summaryrefslogtreecommitdiffstats
path: root/wiki/src/contribute/release_process/tor-browser.mdwn
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2015-04-28 09:56:37 +0200
committeranonym <anonym@riseup.net>2015-04-28 09:56:37 +0200
commit8580ba82964fa65e0193263fee123bfb3a016e14 (patch)
tree361c275dd4e211aef65ef18529b62d2aeb195f9b /wiki/src/contribute/release_process/tor-browser.mdwn
parent5f751d1c88d59bb9038fd6e05ff668ef71dc5a66 (diff)
Store complete URL in tbb-dist-url.txt.
Our installation script determines the Tor Browser version from the tarball filenames and then looks in "$(cat tbb-dist-url.txt)/$VERSION", which isn't very flexible. For instance, for the pre-release of Tor Browser 4.5 our script looks in: http://people.torproject.org/~mikeperry/builds/4.5/ when they in fact were stored in http://people.torproject.org/~mikeperry/builds/4.5-build5/ So let's just store the full URL to the directory storing the tarballs.
Diffstat (limited to 'wiki/src/contribute/release_process/tor-browser.mdwn')
-rw-r--r--wiki/src/contribute/release_process/tor-browser.mdwn8
1 files changed, 4 insertions, 4 deletions
diff --git a/wiki/src/contribute/release_process/tor-browser.mdwn b/wiki/src/contribute/release_process/tor-browser.mdwn
index b958236..2f9989e 100644
--- a/wiki/src/contribute/release_process/tor-browser.mdwn
+++ b/wiki/src/contribute/release_process/tor-browser.mdwn
@@ -49,13 +49,13 @@ and see if the desired version is available. Set `DIST_URL` to the
chosen URL, and set `VERSION` to the desired Tor Browser version, for
example:
- DIST_URL=https://people.torproject.org/~mikeperry/builds/
- VERSION=4.0
+ DIST_URL=https://people.torproject.org/~mikeperry/builds/4.5-build5/
+ VERSION=4.5
Fetch the version's hash file and its detached signature, and verify
with GnuPG:
- wget ${DIST_URL}/${VERSION}/sha256sums.txt{,.asc} && \
+ wget ${DIST_URL}/sha256sums.txt{,.asc} && \
gpg --verify sha256sums.txt.asc sha256sums.txt
Filter the tarballs we want and make them available at build time,
@@ -141,7 +141,7 @@ Import a new set of Tor Browser tarballs
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}" | sed "s,^http://,https://,")/${VERSION}"
+ TBB_TARBALLS_BASE_URL="$(cat "${TBB_DIST_URL_FILE}" | sed "s,^http://,https://,")"
cat "$TBB_SHA256SUMS_FILE" | while read expected_sha256 tarball; do
(
cd "$TMPDIR"