summaryrefslogtreecommitdiffstats
path: root/wiki/src/contribute/release_process/tor-browser.mdwn
diff options
context:
space:
mode:
authorbertagaz <bertagaz@ptitcanardnoir.org>2016-11-16 13:30:01 +0100
committerbertagaz <bertagaz@ptitcanardnoir.org>2016-11-16 13:33:12 +0100
commit2b205d5c93eb3d5e1473fd8a558e42ffc38be09e (patch)
treeaf31373d0370e1544289c20c23ec0025e86a17bf /wiki/src/contribute/release_process/tor-browser.mdwn
parentac3a76ad98cd1de8c73dc9a6e3dd0250aea2135a (diff)
Unify namespace for Tor Browser related variables in the release process.
E.g we already use '$VERSION' for the Tails release version.
Diffstat (limited to 'wiki/src/contribute/release_process/tor-browser.mdwn')
-rw-r--r--wiki/src/contribute/release_process/tor-browser.mdwn42
1 files changed, 21 insertions, 21 deletions
diff --git a/wiki/src/contribute/release_process/tor-browser.mdwn b/wiki/src/contribute/release_process/tor-browser.mdwn
index f890d1f..c20ec87 100644
--- a/wiki/src/contribute/release_process/tor-browser.mdwn
+++ b/wiki/src/contribute/release_process/tor-browser.mdwn
@@ -46,17 +46,17 @@ Have a look at
* <https://people.torproject.org/~boklm/builds/>
* <https://people.torproject.org/~linus/builds/>
-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
+and see if the desired version is available. Set `TBB_DIST_URL` to the
+chosen URL, and set `TBB_VERSION` to the desired Tor Browser version, for
example:
- DIST_URL=https://people.torproject.org/~mikeperry/builds/4.5-build5/
- VERSION=4.5-build5
+ TBB_DIST_URL=https://people.torproject.org/~mikeperry/builds/4.5-build5/
+ TBB_VERSION=4.5
Fetch the version's hash file and its detached signature, and verify
with GnuPG:
- wget ${DIST_URL}/sha256sums-unsigned-build.txt{.asc,} && \
+ wget ${TBB_DIST_URL}/sha256sums-unsigned-build.txt{.asc,} && \
gpg --verify sha256sums-unsigned-build.txt{.asc,}
Filter the tarballs we want and make them available at build time,
@@ -67,7 +67,7 @@ when the tarballs are fetched:
Then update the URL to the one chosen above:
- echo "${DIST_URL}" | sed "s,^https://,http://," > \
+ echo "${TBB_DIST_URL}" | sed "s,^https://,http://," > \
config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt
<div class="note">
@@ -82,17 +82,17 @@ checksum file.
Lastly, commit:
git commit config/chroot_local-includes/usr/share/tails/tbb-*.txt \
- -m "Upgrade Tor Browser to ${VERSION}."
+ -m "Upgrade Tor Browser to ${TBB_VERSION}."
Then do the same operation for the 64-bit tarballs:
git checkout feature/8183-64bit-userspace && \
grep --color=never "\<tor-browser-linux64-.*\.tar.xz$" sha256sums-unsigned-build.txt > \
config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt && \
- echo "${DIST_URL}" | sed "s,^https://,http://," > \
+ echo "${TBB_DIST_URL}" | sed "s,^https://,http://," > \
config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt && \
git commit config/chroot_local-includes/usr/share/tails/tbb-*.txt \
- -m "Upgrade Tor Browser to ${VERSION}."
+ -m "Upgrade Tor Browser to ${TBB_VERSION}."
<div class="caution">
<p>
@@ -154,15 +154,15 @@ Set up environment variables
TAILS_GIT_REPO="$HOME/tails/git"
-3. Make `TORBROWSER_ARCHIVE` point to your local git annex working
+3. Make `TBB_ARCHIVE` point to your local git annex working
copy of our Tor Browser archive, for example:
- TORBROWSER_ARCHIVE="$HOME/tails/torbrowser-archive"
+ TBB_ARCHIVE="$HOME/tails/torbrowser-archive"
-4. Make `TORBROWSER_IMPORT_BRANCH` point to the branch where you want to
+4. Make `TBB_IMPORT_BRANCH` point to the branch where you want to
import the new Tor Browser's metadata, for example:
- TORBROWSER_IMPORT_BRANCH=feature/123456-torbrowser-42.3.4
+ TBB_IMPORT_BRANCH=feature/123456-torbrowser-42.3.4
Import a new set of Tor Browser tarballs
----------------------------------------
@@ -173,7 +173,7 @@ Import a new set of Tor Browser tarballs
CHROOT_INCLUDES="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"
- cd "$TAILS_GIT_REPO" && git checkout "$TORBROWSER_IMPORT_BRANCH"
+ cd "$TAILS_GIT_REPO" && git checkout "$TBB_IMPORT_BRANCH"
TBB_TARBALLS_BASE_URL="$(cat "${TBB_DIST_URL_FILE}" | sed "s,^http://,https://,")"
current_branch=$(git -C "$TAILS_GIT_REPO" branch | awk '/^\* / { print $2 }')
for branch in "$current_branch" feature/8183-64bit-userspace ; do
@@ -195,17 +195,17 @@ Import a new set of Tor Browser tarballs
3. Move the tarballs into your local Git annex:
- cd "$TORBROWSER_ARCHIVE" && \
- mkdir "$VERSION" && cd "$VERSION" && \
+ cd "$TBB_ARCHIVE" && \
+ mkdir "$TBB_VERSION" && cd "$TBB_VERSION" && \
git annex import --duplicate "$TMPDIR/"*
Commit and push your changes
----------------------------
- cd "$TORBROWSER_ARCHIVE" && \
- git commit -m "Add Tor Browser ${VERSION}." && \
+ cd "$TBB_ARCHIVE" && \
+ git commit -m "Add Tor Browser ${TBB_VERSION}." && \
git annex sync && \
- git annex copy --to origin -- "${VERSION}"
+ git annex copy --to origin -- "${TBB_VERSION}"
Wait for the synchronization
----------------------------
@@ -223,11 +223,11 @@ Adjust the URL in the main Git repository
-----------------------------------------
cd "$TAILS_GIT_REPO" && \
- git checkout "$TORBROWSER_IMPORT_BRANCH"
+ git checkout "$TBB_IMPORT_BRANCH"
current_branch=$(git branch | awk '/^\* / { print $2 }')
for branch in "$current_branch" feature/8183-64bit-userspace ; do
git checkout "$branch" && \
- echo "http://torbrowser-archive.tails.boum.org/${VERSION}/" > \
+ echo "http://torbrowser-archive.tails.boum.org/${TBB_VERSION}/" > \
config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt && \
git commit config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt \
-m "Fetch Tor Browser from our own archive." && \