diff options
| author | Micah Lee <micah@micahflee.com> | 2020-10-14 22:36:31 -0700 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2020-10-14 22:36:31 -0700 |
| commit | 50e7471a49600c1788cc823a07781e724137a93c (patch) | |
| tree | 88c8557682bf92414de4a972e49f5608f69e0369 /cli/onionshare_cli/common.py | |
| parent | 6bc085922badf26075af4f7ff8c448bfe454e175 (diff) | |
| download | onionshare-50e7471a49600c1788cc823a07781e724137a93c.tar.gz onionshare-50e7471a49600c1788cc823a07781e724137a93c.zip | |
Make it work in Windows
Diffstat (limited to 'cli/onionshare_cli/common.py')
| -rw-r--r-- | cli/onionshare_cli/common.py | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/cli/onionshare_cli/common.py b/cli/onionshare_cli/common.py index 19a6f11a..0c034a87 100644 --- a/cli/onionshare_cli/common.py +++ b/cli/onionshare_cli/common.py @@ -87,19 +87,11 @@ class Common: tor_geo_ip_file_path = os.path.join(prefix, "share/tor/geoip") tor_geo_ipv6_file_path = os.path.join(prefix, "share/tor/geoip6") elif self.platform == "Windows": - base_path = os.path.join( - os.path.dirname(os.path.dirname(self.get_resource_path(""))), "tor" - ) - tor_path = os.path.join(os.path.join(base_path, "Tor"), "tor.exe") - obfs4proxy_file_path = os.path.join( - os.path.join(base_path, "Tor"), "obfs4proxy.exe" - ) - tor_geo_ip_file_path = os.path.join( - os.path.join(os.path.join(base_path, "Data"), "Tor"), "geoip" - ) - tor_geo_ipv6_file_path = os.path.join( - os.path.join(os.path.join(base_path, "Data"), "Tor"), "geoip6" - ) + base_path = self.get_resource_path("tor") + tor_path = os.path.join(base_path, "Tor", "tor.exe") + obfs4proxy_file_path = os.path.join(base_path, "Tor", "obfs4proxy.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") elif self.platform == "Darwin": base_path = os.path.dirname( os.path.dirname(os.path.dirname(self.get_resource_path(""))) |