Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-05-02 06:26:10 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix get_tor_paths() to point to new Windows paths, and actually build onionshare for win64

Browse source
This commit is contained in:
Micah Lee 2022-05-29 15:23:55 -07:00
parent 092715585b
commit ac9bc039bb
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
2 changed files with 45 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cli/onionshare_cli/common.py
View file

@ -332,21 +332,21 @@ class Common:
# In Windows, the Tor binaries are in the onionshare package, not the onionshare_cli package
base_path = self.get_resource_path("tor")
base_path = base_path.replace("onionshare_cli", "onionshare")
tor_path = os.path.join(base_path, "Tor", "tor.exe")
tor_path = os.path.join(base_path, "tor", "tor.exe")
# If tor.exe isn't there, mayber we're running from the source tree
if not os.path.exists(tor_path):
base_path = os.path.join(os.getcwd(), "onionshare", "resources", "tor")
tor_path = os.path.join(base_path, "Tor", "tor.exe")
tor_path = os.path.join(base_path, "tor.exe")
if not os.path.exists(tor_path):
raise CannotFindTor()
obfs4proxy_file_path = os.path.join(base_path, "Tor", "obfs4proxy.exe")
snowflake_file_path = os.path.join(base_path, "Tor", "snowflake-client.exe")
meek_client_file_path = os.path.join(base_path, "Tor", "meek-client.exe")
tor_geo_ip_file_path = os.path.join(base_path, "Data", "Tor", "geoip")
tor_geo_ipv6_file_path = os.path.join(base_path, "Data", "Tor", "geoip6")
obfs4proxy_file_path = os.path.join(base_path, "tor", "obfs4proxy.exe")
snowflake_file_path = os.path.join(base_path, "tor", "snowflake-client.exe")
meek_client_file_path = os.path.join(base_path, "tor", "meek-client.exe")
tor_geo_ip_file_path = os.path.join(base_path, "tor", "geoip")
tor_geo_ipv6_file_path = os.path.join(base_path, "tor", "geoip6")
elif self.platform == "Darwin":
# Let's see if we have tor binaries in the onionshare GUI package