almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-28 18:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

In Windows, add startupinfo to subprocess calls to prevent terminal windows from opening in the background

Browse source
This commit is contained in:
Micah Lee 2020-02-13 15:33:08 -08:00
parent 400b8d2b83
commit 791d930a55
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
3 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dangerzone/common.py
View file

@ -341,3 +341,11 @@ class Common(object):
pass pass
return pdf_viewers return pdf_viewers
def get_subprocess_startupinfo(self):
if platform.system() == "Windows":
startupinfo = subprocess.STARTUPINFO()
startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
return startupinfo
else:
return None

15
dangerzone/docker_installer.py
View file

@ -28,7 +28,11 @@ def is_docker_installed(common):
def is_docker_ready(common): def is_docker_ready(common):
# Run `docker ps` without an error # Run `docker ps` without an error
try: try:
subprocess.run([common.container_runtime, "ps"], check=True) subprocess.run(
[common.container_runtime, "ps"],
check=True,
startupinfo=common.get_subprocess_startupinfo(),
)
return True return True
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
return False return False
@ -36,7 +40,9 @@ def is_docker_ready(common):
def launch_docker_windows(): def launch_docker_windows():
docker_desktop_path = "C:\\Program Files\\Docker\\Docker\\Docker Desktop.exe" docker_desktop_path = "C:\\Program Files\\Docker\\Docker\\Docker Desktop.exe"
subprocess.Popen([docker_desktop_path]) subprocess.Popen(
[docker_desktop_path], startupinfo=common.get_subprocess_startupinfo()
)
class DockerInstaller(QtWidgets.QDialog): class DockerInstaller(QtWidgets.QDialog):
@ -278,7 +284,10 @@ class Installer(QtCore.QThread):
elif platform.system() == "Windows": elif platform.system() == "Windows":
try: try:
# Run the installer # Run the installer
subprocess.run([self.installer_filename]) subprocess.run(
[self.installer_filename],
startupinfo=common.get_subprocess_startupinfo(),
)
self.install_finished.emit() self.install_finished.emit()
except Exception as e: except Exception as e:

1
dangerzone/tasks.py
View file

@ -31,6 +31,7 @@ class TaskBase(QtCore.QThread):
stderr=subprocess.PIPE, stderr=subprocess.PIPE,
bufsize=1, bufsize=1,
universal_newlines=True, universal_newlines=True,
startupinfo=self.common.get_subprocess_startupinfo(),
) as p: ) as p:
if watch == "stdout": if watch == "stdout":
pipe = p.stdout pipe = p.stdout