Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-03-13 09:26:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

In Tor Browser for macOS, the file or Contents/MacOS/Tor/tor.real has been renamed to just tor

Browse Source
This commit is contained in:
Micah Lee 2023-09-04 18:31:50 -07:00
parent 09f0fb36a6
commit 14ddf20289
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
RELEASE.md
View File

@ -21,8 +21,6 @@ Unless you're a core OnionShare developer making a release, you'll probably neve
### Update dependencies ### Update dependencies
#### Python dependencies
Check `cli/pyproject.toml` to see if any hard-coded versions should be updated. Then, update the dependencies like this: Check `cli/pyproject.toml` to see if any hard-coded versions should be updated. Then, update the dependencies like this:
```sh ```sh
@ -49,10 +47,7 @@ poetry update
cd .. cd ..
``` ```
#### Tor and pluggable transports Update the versions of `meek`, `obfs4proxy`, and `snowflake` in the `desktop/scripts/build-pt-*` scripts, both the bash and PowerShell scripts.
- [ ] Update the version of `meek`, `obfs4proxy`, and `snowflake` in the `desktop/scripts/build-pt-*` scripts, both the bash and PowerShell scripts.
### Update the documentation ### Update the documentation

22
desktop/scripts/get-tor.py
View File

@ -159,7 +159,7 @@ def get_tor_macos(gpg, torkey, macos_url, macos_filename, expected_macos_sig):
os.path.join(dist_path, "geoip6"), os.path.join(dist_path, "geoip6"),
) )
shutil.copyfile( 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.path.join(dist_path, "tor"),
) )
os.chmod(os.path.join(dist_path, "tor"), 0o755) os.chmod(os.path.join(dist_path, "tor"), 0o755)
@ -322,17 +322,27 @@ def main(platform):
) = get_latest_tor_version_urls(platform) ) = get_latest_tor_version_urls(platform)
tmpdir = tempfile.TemporaryDirectory() tmpdir = tempfile.TemporaryDirectory()
gpg = gnupg.GPG(gnupghome=tmpdir.name) 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}") print(f"Imported Tor GPG key: {torkey.fingerprints}")
if platform == "win32": 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": 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": 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": 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: else:
click.echo("invalid platform") click.echo("invalid platform")