aboutsummaryrefslogtreecommitdiff
path: root/cli
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2022-05-29 15:59:19 -0700
committerMicah Lee <micah@micahflee.com>2022-05-29 15:59:19 -0700
commit2490f45343d62048ca68a9ad6ef1048890cdb905 (patch)
tree8ef84752dec2c3d9a66d9ed0c9fcc37a27bf4145 /cli
parentc23621d841e5365d9f98163ca635ed02abdfaa89 (diff)
downloadonionshare-2490f45343d62048ca68a9ad6ef1048890cdb905.tar.gz
onionshare-2490f45343d62048ca68a9ad6ef1048890cdb905.zip
Build both win64 and win32, and update get_tor_paths() to display verbose output about the path its looking for
Diffstat (limited to 'cli')
-rw-r--r--cli/onionshare_cli/common.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/cli/onionshare_cli/common.py b/cli/onionshare_cli/common.py
index da5204cf..ca0acc69 100644
--- a/cli/onionshare_cli/common.py
+++ b/cli/onionshare_cli/common.py
@@ -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):
"""