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

Put tor binaries in desktop app resources, not cli resources, and fix Windows packaging

Browse source
This commit is contained in:
Micah Lee 2020-10-15 19:09:46 -07:00
parent 8340b4aae7
commit ab886e911b
7 changed files with 87 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cli/onionshare_cli/onion.py
View file

@ -152,7 +152,7 @@ class Onion(object):
is necessary for status updates to reach the GUI.
"""
def __init__(self, common, use_tmp_dir=False):
def __init__(self, common, use_tmp_dir=False, get_tor_paths=None):
self.common = common
self.common.log("Onion", "__init__")
@ -167,12 +167,14 @@ class Onion(object):
self.bundle_tor_supported = True
# Set the path of the tor binary, for bundled tor
if not get_tor_paths:
get_tor_paths = self.common.get_tor_paths
(
self.tor_path,
self.tor_geo_ip_file_path,
self.tor_geo_ipv6_file_path,
self.obfs4proxy_file_path,
) = self.common.get_tor_paths()
) = get_tor_paths()
# The tor process
self.tor_proc = None