phantom/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-26 03:02:58 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1789 from mdaleo404/fix_get_tor_linux_platform_name

Browse source 
Update linux64 platform name and lib* names
This commit is contained in:
Saptak Sengupta 2023-12-14 20:18:12 +05:30 • committed by GitHub
commit 60e00a5811
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
desktop/README.md
View file

@ -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 [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 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 ```sh
poetry run python ./scripts/get-tor.py [platform] poetry run python ./scripts/get-tor.py [platform]

12
desktop/scripts/get-tor.py
View file

@ -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) os.chmod(os.path.join(dist_path, "tor"), 0o755)
shutil.copyfile( shutil.copyfile(
os.path.join(tarball_tor_path, "Tor", "libcrypto.so.1.1"), os.path.join(tarball_tor_path, "Tor", "libcrypto.so.3"),
os.path.join(dist_path, "libcrypto.so.1.1"), os.path.join(dist_path, "libcrypto.so.3"),
) )
shutil.copyfile( shutil.copyfile(
os.path.join(tarball_tor_path, "Tor", "libevent-2.1.so.7"), os.path.join(tarball_tor_path, "Tor", "libevent-2.1.so.7"),
os.path.join(dist_path, "libevent-2.1.so.7"), os.path.join(dist_path, "libevent-2.1.so.7"),
) )
shutil.copyfile( shutil.copyfile(
os.path.join(tarball_tor_path, "Tor", "libssl.so.1.1"), os.path.join(tarball_tor_path, "Tor", "libssl.so.3"),
os.path.join(dist_path, "libssl.so.1.1"), os.path.join(dist_path, "libssl.so.3"),
) )
shutil.copyfile( shutil.copyfile(
os.path.join(tarball_tor_path, "Tor", "libstdc++", "libstdc++.so.6"), 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 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: if platform not in valid_platforms:
click.echo(f"platform must be one of: {valid_platforms}") click.echo(f"platform must be one of: {valid_platforms}")
return return
@ -335,7 +335,7 @@ def main(platform):
get_tor_macos( get_tor_macos(
gpg, torkey, platform_url, platform_filename, expected_platform_sig gpg, torkey, platform_url, platform_filename, expected_platform_sig
) )
elif platform == "linux64": elif platform == "linux-x86_64":
get_tor_linux64( get_tor_linux64(
gpg, torkey, platform_url, platform_filename, expected_platform_sig gpg, torkey, platform_url, platform_filename, expected_platform_sig
) )