diff options
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/onionshare_cli/common.py | 23 | ||||
| -rw-r--r-- | cli/onionshare_cli/resources/version.txt | 2 | ||||
| -rw-r--r-- | cli/pyproject.toml | 2 |
3 files changed, 16 insertions, 11 deletions
diff --git a/cli/onionshare_cli/common.py b/cli/onionshare_cli/common.py index ceec654d..67d89571 100644 --- a/cli/onionshare_cli/common.py +++ b/cli/onionshare_cli/common.py @@ -332,21 +332,27 @@ class Common: # In Windows, the Tor binaries are in the onionshare package, not the onionshare_cli package base_path = self.get_resource_path("tor") base_path = base_path.replace("onionshare_cli", "onionshare") - tor_path = os.path.join(base_path, "Tor", "tor.exe") + tor_path = os.path.join(base_path, "tor.exe") # 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", "tor.exe") + 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") - snowflake_file_path = os.path.join(base_path, "Tor", "snowflake-client.exe") - meek_client_file_path = os.path.join(base_path, "Tor", "meek-client.exe") - tor_geo_ip_file_path = os.path.join(base_path, "Data", "Tor", "geoip") - tor_geo_ipv6_file_path = os.path.join(base_path, "Data", "Tor", "geoip6") + obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy.exe") + snowflake_file_path = os.path.join(base_path, "snowflake-client.exe") + meek_client_file_path = os.path.join(base_path, "meek-client.exe") + tor_geo_ip_file_path = os.path.join(base_path, "geoip") + tor_geo_ipv6_file_path = os.path.join(base_path, "geoip6") elif self.platform == "Darwin": # Let's see if we have tor binaries in the onionshare GUI package @@ -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): """ diff --git a/cli/onionshare_cli/resources/version.txt b/cli/onionshare_cli/resources/version.txt index 68151b2e..2a15fcc8 100644 --- a/cli/onionshare_cli/resources/version.txt +++ b/cli/onionshare_cli/resources/version.txt @@ -1 +1 @@ -2.5
\ No newline at end of file +2.6.dev1
\ No newline at end of file diff --git a/cli/pyproject.toml b/cli/pyproject.toml index 5ddaf565..1983cf59 100644 --- a/cli/pyproject.toml +++ b/cli/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "onionshare_cli" -version = "2.5" +version = "2.6" description = "OnionShare lets you securely and anonymously send and receive files. It works by starting a web server, making it accessible as a Tor onion service, and generating an unguessable web address so others can download files from you, or upload files to you. It does _not_ require setting up a separate server or using a third party file-sharing service." authors = ["Micah Lee <micah@micahflee.com>"] license = "GPLv3+" |