aboutsummaryrefslogtreecommitdiff
path: root/cli/onionshare_cli/common.py
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2021-10-13 21:11:56 -0700
committerMicah Lee <micah@micahflee.com>2021-10-13 21:11:56 -0700
commit39d624e923d61dbbaf8d4216a4364c5b443d8802 (patch)
tree1bbd593fcf01a331ad5e4c4ef1f5d953d5731d93 /cli/onionshare_cli/common.py
parentf2dbc972857a7963c82801ebae676b4a70f41c81 (diff)
downloadonionshare-39d624e923d61dbbaf8d4216a4364c5b443d8802.tar.gz
onionshare-39d624e923d61dbbaf8d4216a4364c5b443d8802.zip
Allow selecting a snowflake bridge, and make it try to use the snowflake bridge
Diffstat (limited to 'cli/onionshare_cli/common.py')
-rw-r--r--cli/onionshare_cli/common.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/cli/onionshare_cli/common.py b/cli/onionshare_cli/common.py
index 78da8882..945a75bb 100644
--- a/cli/onionshare_cli/common.py
+++ b/cli/onionshare_cli/common.py
@@ -312,6 +312,9 @@ class Common:
# Look in resources first
base_path = self.get_resource_path("tor")
if os.path.exists(base_path):
+ self.log(
+ "Common", "get_tor_paths", f"using tor binaries in {base_path}"
+ )
tor_path = os.path.join(base_path, "tor")
tor_geo_ip_file_path = os.path.join(base_path, "geoip")
tor_geo_ipv6_file_path = os.path.join(base_path, "geoip6")
@@ -319,6 +322,9 @@ class Common:
snowflake_file_path = os.path.join(base_path, "snowflake-client")
else:
# Fallback to looking in the path
+ self.log(
+ "Common", "get_tor_paths", f"using tor binaries in system path"
+ )
tor_path = shutil.which("tor")
if not tor_path:
raise CannotFindTor()