From 3e80d570a61c17e0e56683e3a1edc50cd82225d7 Mon Sep 17 00:00:00 2001
From: Tails developers <amnesia@boum.org>
Date: Mon, 20 Oct 2014 22:32:47 +0200
Subject: [PATCH] Use 7z everywhere for consistency.

---
 config/chroot_local-includes/usr/local/sbin/i2p-browser    | 2 +-
 config/chroot_local-includes/usr/local/sbin/unsafe-browser | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/chroot_local-includes/usr/local/sbin/i2p-browser b/config/chroot_local-includes/usr/local/sbin/i2p-browser
index 9ec76b8b22..734b203e2d 100755
--- a/config/chroot_local-includes/usr/local/sbin/i2p-browser
+++ b/config/chroot_local-includes/usr/local/sbin/i2p-browser
@@ -126,7 +126,7 @@ set_chroot_browser_name () {
     TMP=$(mktemp -d)
     # Non-zero exit code due to non-standard ZIP archive.
     # The following steps will fail soon if the extraction failed anyway.
-    unzip -d "${TMP}" "${PACK}" || true
+    7z x -o"${TMP}" "${PACK}" || true
     sed -i "s/<"'!'"ENTITY\s\+brand\(Full\|Short\)Name.*$/<"'!'"ENTITY brand\1Name \"${NAME}\">/" "${TMP}/${TOP}/${REST}/${BRANDING}"
     rm "${PACK}"
     (cd $TMP ; 7z a -tzip "${PACK}" .)
diff --git a/config/chroot_local-includes/usr/local/sbin/unsafe-browser b/config/chroot_local-includes/usr/local/sbin/unsafe-browser
index 5188c0b3ea..37a28ebbcf 100755
--- a/config/chroot_local-includes/usr/local/sbin/unsafe-browser
+++ b/config/chroot_local-includes/usr/local/sbin/unsafe-browser
@@ -126,7 +126,7 @@ set_chroot_browser_name () {
     TMP=$(mktemp -d)
     # Non-zero exit code due to non-standard ZIP archive.
     # The following steps will fail soon if the extraction failed anyway.
-    unzip -d "${TMP}" "${PACK}" || true
+    7z x -o"${TMP}" "${PACK}" || true
     sed -i "s/<"'!'"ENTITY\s\+brand\(Full\|Short\)Name.*$/<"'!'"ENTITY brand\1Name \"${NAME}\">/" "${TMP}/${TOP}/${REST}/${BRANDING}"
     rm "${PACK}"
     (cd $TMP ; 7z a -tzip "${PACK}" .)
-- 
GitLab