aboutsummaryrefslogtreecommitdiff
path: root/cli
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2022-05-29 17:07:22 -0700
committerMicah Lee <micah@micahflee.com>2022-05-29 17:07:22 -0700
commitf7dd3380f82b263984617cae7b82e1f63185b92e (patch)
tree11efd6c8ad226c79e392bb0c3d638760760acb14 /cli
parentd2c55a0a8cd8e66e8948f2d32647548d7c99201f (diff)
downloadonionshare-f7dd3380f82b263984617cae7b82e1f63185b92e.tar.gz
onionshare-f7dd3380f82b263984617cae7b82e1f63185b92e.zip
Fix tor path again
Diffstat (limited to 'cli')
-rw-r--r--cli/onionshare_cli/common.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/cli/onionshare_cli/common.py b/cli/onionshare_cli/common.py
index ca0acc69..67d89571 100644
--- a/cli/onionshare_cli/common.py
+++ b/cli/onionshare_cli/common.py
@@ -332,7 +332,7 @@ 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.exe")
# If tor.exe isn't there, mayber we're running from the source tree
if not os.path.exists(tor_path):
@@ -348,11 +348,11 @@ class Common:
)
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, "tor", "geoip")
- tor_geo_ipv6_file_path = os.path.join(base_path, "tor", "geoip6")
+ obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy.exe")
+ snowflake_file_path = os.path.join(base_path, "snowflake-client.exe")
+ meek_client_file_path = os.path.join(base_path, "meek-client.exe")
+ tor_geo_ip_file_path = os.path.join(base_path, "geoip")
+ tor_geo_ipv6_file_path = os.path.join(base_path, "geoip6")
elif self.platform == "Darwin":
# Let's see if we have tor binaries in the onionshare GUI package