diff options
| author | Micah Lee <micah@micahflee.com> | 2022-05-29 15:23:55 -0700 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2022-05-29 15:23:55 -0700 |
| commit | ac9bc039bb9415675ddf037dfbbe1be142dd862c (patch) | |
| tree | 675f251127e815bf4ff38c1dc22eb46a4b2e1339 /cli | |
| parent | 092715585b4545201cab6252d9349821264b4c6c (diff) | |
| download | onionshare-ac9bc039bb9415675ddf037dfbbe1be142dd862c.tar.gz onionshare-ac9bc039bb9415675ddf037dfbbe1be142dd862c.zip | |
Fix get_tor_paths() to point to new Windows paths, and actually build onionshare for win64
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/onionshare_cli/common.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cli/onionshare_cli/common.py b/cli/onionshare_cli/common.py index ceec654d..da5204cf 100644 --- a/cli/onionshare_cli/common.py +++ b/cli/onionshare_cli/common.py @@ -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 |