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

Fix tor path again

Browse source
This commit is contained in:
Micah Lee 2022-05-29 17:07:22 -07:00
parent d2c55a0a8c
commit f7dd3380f8
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cli/onionshare_cli/common.py
View file

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