Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-02-05 01:15:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '910_flatpak' of github.com:micahflee/onionshare into 910_flatpak

Browse Source
This commit is contained in:
Micah Lee 2020-04-05 21:03:29 -07:00
commit da13a166a1
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
onionshare/common.py
View File

@ -97,8 +97,10 @@ class Common:
) )
elif self.platform == "BSD" or self.platform == "Linux": elif self.platform == "BSD" or self.platform == "Linux":
# Assume OnionShare is installed systemwide in Linux, since we're not running in dev mode # Look for resources relative to the binary, so if the binary is /usr/bin/onionshare-gui and
prefix = os.path.join(sys.prefix, "share/onionshare") # the resource dir is /usr/share/onionshare, then the resource dir relative to the binary dir
# is ../share/onionshare
prefix = os.path.join(os.path.dirname(os.path.dirname(sys.argv[0])), "share/onionshare")
elif getattr(sys, "frozen", False): elif getattr(sys, "frozen", False):
# Check if app is "frozen" # Check if app is "frozen"
@ -112,10 +114,11 @@ class Common:
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"