diff options
| author | Saptak Sengupta <saptak013@gmail.com> | 2023-12-14 20:18:12 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-14 20:18:12 +0530 |
| commit | 60e00a5811224da2063ea7f79a285fbb2a8c95ce (patch) | |
| tree | 5802ad32b476b3cfa4af6a4a4b1be660ba4f8242 | |
| parent | 3f180e2aa78e6eeac9fa7c1525158342b09d65ca (diff) | |
| parent | e00d395ce5d5b79cc4476415ab040f3f3afca96b (diff) | |
| download | onionshare-60e00a5811224da2063ea7f79a285fbb2a8c95ce.tar.gz onionshare-60e00a5811224da2063ea7f79a285fbb2a8c95ce.zip | |
Merge pull request #1789 from mdaleo404/fix_get_tor_linux_platform_name
Update linux64 platform name and lib* names
| -rw-r--r-- | desktop/README.md | 2 | ||||
| -rw-r--r-- | desktop/scripts/get-tor.py | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/desktop/README.md b/desktop/README.md index dbb2d7be..88835c27 100644 --- a/desktop/README.md +++ b/desktop/README.md @@ -35,7 +35,7 @@ poetry install - Download and install [7-Zip (x64)](https://7-zip.org/). Add `C:\Program Files\7-Zip` to your path. - Download and install [gpg4win](https://gpg4win.org/). Add `C:\Program Files (x86)\GnuPG\bin` to your path. -Download Tor Browser and extract the binaries for your platform. The platform must be `win64`, `macos`, or `linux64`. +Download Tor Browser and extract the binaries for your platform. The platform must be `win64`, `macos`, or `linux-x86_64`. ```sh poetry run python ./scripts/get-tor.py [platform] diff --git a/desktop/scripts/get-tor.py b/desktop/scripts/get-tor.py index fab70b7e..48236124 100644 --- a/desktop/scripts/get-tor.py +++ b/desktop/scripts/get-tor.py @@ -233,16 +233,16 @@ def get_tor_linux64(gpg, torkey, linux64_url, linux64_filename, expected_linux64 ) os.chmod(os.path.join(dist_path, "tor"), 0o755) shutil.copyfile( - os.path.join(tarball_tor_path, "Tor", "libcrypto.so.1.1"), - os.path.join(dist_path, "libcrypto.so.1.1"), + os.path.join(tarball_tor_path, "Tor", "libcrypto.so.3"), + os.path.join(dist_path, "libcrypto.so.3"), ) shutil.copyfile( os.path.join(tarball_tor_path, "Tor", "libevent-2.1.so.7"), os.path.join(dist_path, "libevent-2.1.so.7"), ) shutil.copyfile( - os.path.join(tarball_tor_path, "Tor", "libssl.so.1.1"), - os.path.join(dist_path, "libssl.so.1.1"), + os.path.join(tarball_tor_path, "Tor", "libssl.so.3"), + os.path.join(dist_path, "libssl.so.3"), ) shutil.copyfile( os.path.join(tarball_tor_path, "Tor", "libstdc++", "libstdc++.so.6"), @@ -310,7 +310,7 @@ def main(platform): """ Download Tor Browser and extract tor binaries """ - valid_platforms = ["win64", "macos", "linux64"] + valid_platforms = ["win64", "macos", "linux-x86_64"] if platform not in valid_platforms: click.echo(f"platform must be one of: {valid_platforms}") return @@ -335,7 +335,7 @@ def main(platform): get_tor_macos( gpg, torkey, platform_url, platform_filename, expected_platform_sig ) - elif platform == "linux64": + elif platform == "linux-x86_64": get_tor_linux64( gpg, torkey, platform_url, platform_filename, expected_platform_sig ) |