From db5bf5234914811fbb9a879ee04d070caba7f949 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Mon, 20 Nov 2023 14:49:57 +0000
Subject: [PATCH] Look for a zstd archive, not gz.
---
upstream/build_tor_macos.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/upstream/build_tor_macos.py b/upstream/build_tor_macos.py
index 9057871..957ee1a 100755
--- a/upstream/build_tor_macos.py
+++ b/upstream/build_tor_macos.py
@@ -57,11 +57,13 @@ def build_arch(versions, arch):
libevent_version = versions['upstream']['libevent']
# build using rbm
check_call(['./rbm/rbm', 'build', 'tor', '--target', 'release', '--target', 'torbrowser-' + target], cwd=Path(BUILD_DIR))
- # extract tar.gz file
+ # extract tar.zst file
arch_dir = Path('output') / PLATFORM / arch
arch_dir.mkdir(parents=True, exist_ok=True)
- tar_file = next(Path(BUILD_DIR).glob('out/tor/tor-*-' + target + '-*.tar.gz'))
- tar = tarfile.open(tar_file, "r:gz")
+ tar_zst_file = str(next(Path(BUILD_DIR).glob('out/tor/tor-*-' + target + '-*.tar.zst')))
+ check_call(['zstd', '-d', tar_zst_file])
+ tar_file = tar_zst_file[:-4]
+ tar = tarfile.open(tar_file, 'r')
tar.extractall(path=arch_dir)
tar.close()
# move contents out of tor/ directory
--
GitLab