From 0a56874eabf2c98d22187cd9126324298679f500 Mon Sep 17 00:00:00 2001
From: James Wettenhall <james.wettenhall@monash.edu>
Date: Wed, 23 Sep 2015 12:32:33 +1000
Subject: [PATCH] Trying to avoid having Command Prompt windows pop up when we
 run cscript.exe on Windows.

---
 mydata/models/settings.py | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/mydata/models/settings.py b/mydata/models/settings.py
index 68efc052..886cfd3b 100644
--- a/mydata/models/settings.py
+++ b/mydata/models/settings.py
@@ -23,6 +23,15 @@
 from mydata.utils.exceptions import Unauthorized
 from mydata.utils.exceptions import IncompatibleMyTardisVersion
 
+defaultStartupInfo = None
+defaultCreationFlags = 0
+if sys.platform.startswith("win"):
+    defaultStartupInfo = subprocess.STARTUPINFO()
+    defaultStartupInfo.dwFlags |= subprocess._subprocess.STARTF_USESHOWWINDOW
+    defaultStartupInfo.wShowWindow = subprocess.SW_HIDE
+    import win32process
+    defaultCreationFlags = win32process.CREATE_NO_WINDOW
+
 
 class LastSettingsUpdateTrigger:
     READ_FROM_DISK = 0
@@ -948,7 +957,9 @@ def invalid_user():
                 logger.info("Checking for MyData shortcut in user "
                             "startup items.")
                 proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
-                                        stderr=subprocess.STDOUT, shell=False)
+                                        stderr=subprocess.STDOUT, shell=False,
+                                        startupinfo=defaultStartupInfo,
+                                        creationflags=defaultCreationFlags)
                 output, _ = proc.communicate()
                 shortcutInStartupItems = (proc.returncode == 0)
                 if shortcutInStartupItems:
@@ -968,7 +979,9 @@ def invalid_user():
                 logger.info("Checking for MyData shortcut in common "
                             "startup items.")
                 proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
-                                        stderr=subprocess.STDOUT, shell=False)
+                                        stderr=subprocess.STDOUT, shell=False,
+                                        startupinfo=defaultStartupInfo,
+                                        creationflags=defaultCreationFlags)
                 output, _ = proc.communicate()
                 shortcutInCommonStartupItems = (proc.returncode == 0)
                 if shortcutInCommonStartupItems:
@@ -1009,7 +1022,9 @@ def invalid_user():
                                 "startup items.")
                     proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
                                             stderr=subprocess.STDOUT,
-                                            shell=False)
+                                            shell=False,
+                                            startupinfo=defaultStartupInfo,
+                                            creationflags=defaultCreationFlags)
                     output, _ = proc.communicate()
                     success = (proc.returncode == 0)
                     if not success:
@@ -1035,7 +1050,9 @@ def invalid_user():
                     cmd = ['cscript', '//Nologo', vbScript.name]
                     proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
                                             stderr=subprocess.STDOUT,
-                                            shell=False)
+                                            shell=False,
+                                            startupinfo=defaultStartupInfo,
+                                            creationflags=defaultCreationFlags)
                     output, _ = proc.communicate()
                     success = (proc.returncode == 0)
                     if not success: