aboutsummaryrefslogtreecommitdiff
path: root/desktop/src/onionshare/gui_common.py
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2020-11-04 15:57:14 -0800
committerMicah Lee <micah@micahflee.com>2020-11-04 15:57:14 -0800
commitb2f30e90b34ef3a44390bf905d9f47ee195f9954 (patch)
tree6969f44e5c33b59dbaa014a595b08317feda3139 /desktop/src/onionshare/gui_common.py
parentd9153758cdfb44b7ff37068d39c33161aea0e227 (diff)
downloadonionshare-b2f30e90b34ef3a44390bf905d9f47ee195f9954.tar.gz
onionshare-b2f30e90b34ef3a44390bf905d9f47ee195f9954.zip
Make OnionShare briefcase work in macOS
Diffstat (limited to 'desktop/src/onionshare/gui_common.py')
-rw-r--r--desktop/src/onionshare/gui_common.py16
1 files changed, 5 insertions, 11 deletions
diff --git a/desktop/src/onionshare/gui_common.py b/desktop/src/onionshare/gui_common.py
index cf005e6a..a51e2641 100644
--- a/desktop/src/onionshare/gui_common.py
+++ b/desktop/src/onionshare/gui_common.py
@@ -344,17 +344,11 @@ class GuiCommon:
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.common.platform == "Darwin":
- base_path = os.path.dirname(
- os.path.dirname(os.path.dirname(self.get_resource_path("")))
- )
- tor_path = os.path.join(base_path, "Resources", "Tor", "tor")
- tor_geo_ip_file_path = os.path.join(base_path, "Resources", "Tor", "geoip")
- tor_geo_ipv6_file_path = os.path.join(
- base_path, "Resources", "Tor", "geoip6"
- )
- obfs4proxy_file_path = os.path.join(
- base_path, "Resources", "Tor", "obfs4proxy"
- )
+ base_path = self.get_resource_path("tor")
+ tor_path = os.path.join(base_path, "tor")
+ obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy.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.common.platform == "BSD":
tor_path = "/usr/local/bin/tor"
tor_geo_ip_file_path = "/usr/local/share/tor/geoip"