diff options
| author | Micah Lee <micah@micahflee.com> | 2023-09-04 18:31:50 -0700 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2023-09-04 18:58:06 -0700 |
| commit | 0d59218bf756db8852caebc084bc0a1da377eec0 (patch) | |
| tree | 72dcc13fabe9f8a24bd425bb0ced5f9e516163f3 | |
| parent | 9f8ec839909903041e1802a10453af0f733c907d (diff) | |
| download | onionshare-0d59218bf756db8852caebc084bc0a1da377eec0.tar.gz onionshare-0d59218bf756db8852caebc084bc0a1da377eec0.zip | |
In Tor Browser for macOS, the file or Contents/MacOS/Tor/tor.real has been renamed to just tor
| -rw-r--r-- | RELEASE.md | 7 | ||||
| -rw-r--r-- | desktop/scripts/get-tor.py | 22 |
2 files changed, 17 insertions, 12 deletions
@@ -21,8 +21,6 @@ Unless you're a core OnionShare developer making a release, you'll probably neve ### Update dependencies -#### Python dependencies - Check `cli/pyproject.toml` to see if any hard-coded versions should be updated. Then, update the dependencies like this: ```sh @@ -49,10 +47,7 @@ poetry update cd .. ``` -#### Tor and pluggable transports - -- [ ] Update the version of `meek`, `obfs4proxy`, and `snowflake` in the `desktop/scripts/build-pt-*` scripts, both the bash and PowerShell scripts. - +Update the versions of `meek`, `obfs4proxy`, and `snowflake` in the `desktop/scripts/build-pt-*` scripts, both the bash and PowerShell scripts. ### Update the documentation diff --git a/desktop/scripts/get-tor.py b/desktop/scripts/get-tor.py index 12bf0b50..17ffec9d 100644 --- a/desktop/scripts/get-tor.py +++ b/desktop/scripts/get-tor.py @@ -159,7 +159,7 @@ def get_tor_macos(gpg, torkey, macos_url, macos_filename, expected_macos_sig): os.path.join(dist_path, "geoip6"), ) shutil.copyfile( - os.path.join(dmg_tor_path, "MacOS", "Tor", "tor.real"), + os.path.join(dmg_tor_path, "MacOS", "Tor", "tor"), os.path.join(dist_path, "tor"), ) os.chmod(os.path.join(dist_path, "tor"), 0o755) @@ -322,17 +322,27 @@ def main(platform): ) = get_latest_tor_version_urls(platform) tmpdir = tempfile.TemporaryDirectory() gpg = gnupg.GPG(gnupghome=tmpdir.name) - torkey = gpg.import_keys_file(os.path.join(root_path, "scripts", "kounek7zrdx745qydx6p59t9mqjpuhdf")) + torkey = gpg.import_keys_file( + os.path.join(root_path, "scripts", "kounek7zrdx745qydx6p59t9mqjpuhdf") + ) print(f"Imported Tor GPG key: {torkey.fingerprints}") if platform == "win32": - get_tor_windows(gpg, torkey, platform_url, platform_filename, expected_platform_sig) + get_tor_windows( + gpg, torkey, platform_url, platform_filename, expected_platform_sig + ) elif platform == "win64": - get_tor_windows(gpg, torkey, platform_url, platform_filename, expected_platform_sig) + get_tor_windows( + gpg, torkey, platform_url, platform_filename, expected_platform_sig + ) elif platform == "macos": - get_tor_macos(gpg, torkey, platform_url, platform_filename, expected_platform_sig) + get_tor_macos( + gpg, torkey, platform_url, platform_filename, expected_platform_sig + ) elif platform == "linux64": - get_tor_linux64(gpg, torkey, platform_url, platform_filename, expected_platform_sig) + get_tor_linux64( + gpg, torkey, platform_url, platform_filename, expected_platform_sig + ) else: click.echo("invalid platform") |