pyrox.dev
fork
Configure Feed
Select the types of activity you want to include in your feed.
lol
fork
Configure Feed
Select the types of activity you want to include in your feed.
1--- a/onionshare/gui_common.py
2+++ b/onionshare/gui_common.py
3@@ -391,29 +391,10 @@ class GuiCommon:
4 }
5
6 def get_tor_paths(self):
7- if self.common.platform == "Linux":
8- tor_path = shutil.which("tor")
9- obfs4proxy_file_path = shutil.which("obfs4proxy")
10- prefix = os.path.dirname(os.path.dirname(tor_path))
11- tor_geo_ip_file_path = os.path.join(prefix, "share/tor/geoip")
12- tor_geo_ipv6_file_path = os.path.join(prefix, "share/tor/geoip6")
13- elif self.common.platform == "Windows":
14- base_path = self.get_resource_path("tor")
15- tor_path = os.path.join(base_path, "Tor", "tor.exe")
16- obfs4proxy_file_path = os.path.join(base_path, "Tor", "obfs4proxy.exe")
17- tor_geo_ip_file_path = os.path.join(base_path, "Data", "Tor", "geoip")
18- tor_geo_ipv6_file_path = os.path.join(base_path, "Data", "Tor", "geoip6")
19- elif self.common.platform == "Darwin":
20- base_path = self.get_resource_path("tor")
21- tor_path = os.path.join(base_path, "tor")
22- obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy")
23- tor_geo_ip_file_path = os.path.join(base_path, "geoip")
24- tor_geo_ipv6_file_path = os.path.join(base_path, "geoip6")
25- elif self.common.platform == "BSD":
26- tor_path = "/usr/local/bin/tor"
27- tor_geo_ip_file_path = "/usr/local/share/tor/geoip"
28- tor_geo_ipv6_file_path = "/usr/local/share/tor/geoip6"
29- obfs4proxy_file_path = "/usr/local/bin/obfs4proxy"
30+ tor_path = "@tor@/bin/tor"
31+ tor_geo_ip_file_path = "@geoip@/share/tor/geoip"
32+ tor_geo_ipv6_file_path = "@geoip@/share/tor/geoip6"
33+ obfs4proxy_file_path = "@obfs4@/bin/obfs4proxy"
34
35 return (
36 tor_path,