Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-10-01 01:35:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make onionshare tor process detection work in Windows

Browse Source
This commit is contained in:
Micah Lee 2020-11-17 18:46:22 -08:00
parent 4085814a33
commit 65dff09a68
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cli/onionshare_cli/onion.py
View File

@ -238,7 +238,7 @@ class Onion(object):
# If there is an existing OnionShare tor process, kill it # If there is an existing OnionShare tor process, kill it
for proc in psutil.process_iter(["pid", "name", "username"]): for proc in psutil.process_iter(["pid", "name", "username"]):
if proc.username() == getpass.getuser(): try:
cmdline = proc.cmdline() cmdline = proc.cmdline()
if ( if (
cmdline[0] == self.tor_path cmdline[0] == self.tor_path
@ -252,6 +252,9 @@ class Onion(object):
) )
proc.terminate() proc.terminate()
proc.wait() proc.wait()
break
except:
pass
if self.common.platform == "Windows" or self.common.platform == "Darwin": if self.common.platform == "Windows" or self.common.platform == "Darwin":
# Windows doesn't support unix sockets, so it must use a network port. # Windows doesn't support unix sockets, so it must use a network port.