onionshare: 2.5 -> 2.6
This commit is contained in:
parent
91d1eb9f2a
commit
f095798678
|
@ -26,12 +26,12 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "2.5";
|
version = "2.6";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "onionshare";
|
owner = "onionshare";
|
||||||
repo = "onionshare";
|
repo = "onionshare";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "xCAM+tjjyDg/gqAXr4YNPhM8R3n9r895jktisAGlpZo=";
|
sha256 = "sha256-LA7XlzoCXUiG/9subTddAd22336wO9sOHCIBlQK4Ga4=";
|
||||||
};
|
};
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Securely and anonymously send and receive files";
|
description = "Securely and anonymously send and receive files";
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/onionshare/gui_common.py
|
--- a/onionshare/gui_common.py
|
||||||
+++ b/onionshare/gui_common.py
|
+++ b/onionshare/gui_common.py
|
||||||
@@ -410,52 +410,12 @@ class GuiCommon:
|
@@ -482,52 +482,12 @@ class GuiCommon:
|
||||||
}
|
}
|
||||||
|
|
||||||
def get_tor_paths(self):
|
def get_tor_paths(self):
|
||||||
|
@ -29,12 +29,12 @@
|
||||||
-
|
-
|
||||||
- if self.common.platform == "Windows":
|
- if self.common.platform == "Windows":
|
||||||
- base_path = self.get_resource_path("tor")
|
- base_path = self.get_resource_path("tor")
|
||||||
- tor_path = os.path.join(base_path, "Tor", "tor.exe")
|
- tor_path = os.path.join(base_path, "tor.exe")
|
||||||
- obfs4proxy_file_path = os.path.join(base_path, "Tor", "obfs4proxy.exe")
|
- obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy.exe")
|
||||||
- snowflake_file_path = os.path.join(base_path, "Tor", "snowflake-client.exe")
|
- snowflake_file_path = os.path.join(base_path, "snowflake-client.exe")
|
||||||
- meek_client_file_path = os.path.join(base_path, "Tor", "meek-client.exe")
|
- meek_client_file_path = os.path.join(base_path, "meek-client.exe")
|
||||||
- tor_geo_ip_file_path = os.path.join(base_path, "Data", "Tor", "geoip")
|
- tor_geo_ip_file_path = os.path.join(base_path, "geoip")
|
||||||
- tor_geo_ipv6_file_path = os.path.join(base_path, "Data", "Tor", "geoip6")
|
- tor_geo_ipv6_file_path = os.path.join(base_path, "geoip6")
|
||||||
- elif self.common.platform == "Darwin":
|
- elif self.common.platform == "Darwin":
|
||||||
- base_path = self.get_resource_path("tor")
|
- base_path = self.get_resource_path("tor")
|
||||||
- tor_path = os.path.join(base_path, "tor")
|
- tor_path = os.path.join(base_path, "tor")
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/onionshare_cli/common.py
|
--- a/onionshare_cli/common.py
|
||||||
+++ b/onionshare_cli/common.py
|
+++ b/onionshare_cli/common.py
|
||||||
@@ -318,67 +318,12 @@ class Common:
|
@@ -318,73 +318,12 @@ class Common:
|
||||||
return path
|
return path
|
||||||
|
|
||||||
def get_tor_paths(self):
|
def get_tor_paths(self):
|
||||||
|
@ -18,21 +18,27 @@
|
||||||
- # In Windows, the Tor binaries are in the onionshare package, not the onionshare_cli package
|
- # In Windows, the Tor binaries are in the onionshare package, not the onionshare_cli package
|
||||||
- base_path = self.get_resource_path("tor")
|
- base_path = self.get_resource_path("tor")
|
||||||
- base_path = base_path.replace("onionshare_cli", "onionshare")
|
- 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 tor.exe isn't there, mayber we're running from the source tree
|
||||||
- if not os.path.exists(tor_path):
|
- 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")
|
- 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):
|
- if not os.path.exists(tor_path):
|
||||||
|
- self.log(
|
||||||
|
- "Common", "get_tor_paths", f"Cannot find tor.exe at {tor_path}"
|
||||||
|
- )
|
||||||
- raise CannotFindTor()
|
- raise CannotFindTor()
|
||||||
-
|
-
|
||||||
- obfs4proxy_file_path = os.path.join(base_path, "Tor", "obfs4proxy.exe")
|
- obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy.exe")
|
||||||
- snowflake_file_path = os.path.join(base_path, "Tor", "snowflake-client.exe")
|
- snowflake_file_path = os.path.join(base_path, "snowflake-client.exe")
|
||||||
- meek_client_file_path = os.path.join(base_path, "Tor", "meek-client.exe")
|
- meek_client_file_path = os.path.join(base_path, "meek-client.exe")
|
||||||
- tor_geo_ip_file_path = os.path.join(base_path, "Data", "Tor", "geoip")
|
- tor_geo_ip_file_path = os.path.join(base_path, "geoip")
|
||||||
- tor_geo_ipv6_file_path = os.path.join(base_path, "Data", "Tor", "geoip6")
|
- tor_geo_ipv6_file_path = os.path.join(base_path, "geoip6")
|
||||||
-
|
-
|
||||||
- elif self.platform == "Darwin":
|
- elif self.platform == "Darwin":
|
||||||
- # Let's see if we have tor binaries in the onionshare GUI package
|
- # Let's see if we have tor binaries in the onionshare GUI package
|
||||||
|
|
Loading…
Reference in a new issue