summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeeshan Ali (Khattak) <zeeshanak@gnome.org>2013-02-25 14:56:36 +0100
committerZeeshan Ali (Khattak) <zeeshanak@gnome.org>2013-02-25 18:30:29 +0100
commita007e93530ea09fbe73f8f87663379c39cbc4a5f (patch)
treefad26a357a01cad13bb928734f51a539fb252e95
parent6c5a9e136cb3879b657ce0c1a27b4c7d8d11cf50 (diff)
installer,windows: Use '/c' option of cmd.exe
Use '/c' option of cmd.exe instead of '/k' as that apparently keeps the process running (at least on windows7) and any commands after the loop never gets executed. TBH I'm a bit confused about '/c' vs '/k' option and the docs don't help: http://technet.microsoft.com/en-us/library/bb490880.aspx#EBAA What I know for certain is that without this change, Windows 7 installer just hangs with an empty cmd.exe window open forever at the end of installation. Also I have tested that this change doesn't break this script for Windows XP.
-rw-r--r--data/install-scripts/windows-cmd.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/data/install-scripts/windows-cmd.xml b/data/install-scripts/windows-cmd.xml
index b3121dc..7a56846 100644
--- a/data/install-scripts/windows-cmd.xml
+++ b/data/install-scripts/windows-cmd.xml
@@ -69,7 +69,7 @@ if not "<xsl:value-of select="config/avatar-location"/>"=="" copy "<xsl:value-of
REGEDIT /S <xsl:call-template name="script-disk"/>:\windows.reg
<xsl:call-template name="post-install-drivers-disk"/>:
reg add "HKCU\Software\Policies\Microsoft\Windows NT\Driver Signing" /v BehaviorOnFailedVerify /t reg_dword /d 00000000 /f
-for %%i in ("<xsl:call-template name="post-install-drivers-disk"/>:<xsl:value-of select="config/post-install-drivers-location"/>\*.cmd") do cmd /k %%i
+for %%i in ("<xsl:call-template name="post-install-drivers-disk"/>:<xsl:value-of select="config/post-install-drivers-location"/>\*.cmd") do cmd /c %%i
reg add "HKCU\Software\Policies\Microsoft\Windows NT\Driver Signing" /v BehaviorOnFailedVerify /t reg_dword /d 00000001 /f
EXIT
</xsl:template>