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

Build both win64 and win32, and update get_tor_paths() to display verbose output about the path its looking for

Browse source
This commit is contained in:
Micah Lee 2022-05-29 15:59:19 -07:00
parent 176cc05eb0
commit a8b9d75062
2 changed files with 186 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cli/onionshare_cli/common.py
View file

@ -336,10 +336,16 @@ class Common:
# If tor.exe isn't there, mayber we're running from the source tree
if not os.path.exists(tor_path):
self.log(
"Common", "get_tor_paths", f"Cannot find tor.exe at {tor_path}"
)
base_path = os.path.join(os.getcwd(), "onionshare", "resources", "tor")
tor_path = os.path.join(base_path, "tor.exe")
if not os.path.exists(tor_path):
self.log(
"Common", "get_tor_paths", f"Cannot find tor.exe at {tor_path}"
)
raise CannotFindTor()
obfs4proxy_file_path = os.path.join(base_path, "tor", "obfs4proxy.exe")
@ -499,7 +505,7 @@ class Common:
if valid_bridges:
return valid_bridges
else:
return False
return False
def is_flatpak(self):
"""
@ -513,7 +519,6 @@ class Common:
"""
return os.environ.get("SNAP_INSTANCE_NAME") == "onionshare"
@staticmethod
def random_string(num_bytes, output_len=None):
"""