Update tor paths to use paths relative to the binary, instead of absolute paths

This commit is contained in:
Micah Lee 2019-11-27 15:41:37 -08:00
parent 347d6ab19f
commit e253b06549
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73

View File

@ -114,10 +114,11 @@ class Common(object):
def get_tor_paths(self): def get_tor_paths(self):
if self.platform == "Linux": if self.platform == "Linux":
tor_path = "/usr/bin/tor" prefix = os.path.dirname(os.path.dirname(sys.argv[0]))
tor_geo_ip_file_path = "/usr/share/tor/geoip" tor_path = os.path.join(prefix, "bin/tor")
tor_geo_ipv6_file_path = "/usr/share/tor/geoip6" tor_geo_ip_file_path = os.path.join(prefix, "share/tor/geoip")
obfs4proxy_file_path = "/usr/bin/obfs4proxy" tor_geo_ipv6_file_path = os.path.join(prefix, "share/tor/geoip6")
obfs4proxy_file_path = os.path.join(prefix, "bin/obfs4proxy")
elif self.platform == "Windows": elif self.platform == "Windows":
base_path = os.path.join( base_path = os.path.join(
os.path.dirname(os.path.dirname(self.get_resource_path(""))), "tor" os.path.dirname(os.path.dirname(self.get_resource_path(""))), "tor"