From cb9d0272f945e23f92559482b769d7fa2f570a0c Mon Sep 17 00:00:00 2001 From: Rob Reynolds Date: Wed, 23 Dec 2015 09:29:56 -0600 Subject: [PATCH] (GH-510) allow silentargs in template The SilentArgs argument can be specified with choco new, however the template value was not in the install template. It was removed in 7b468c8e6ff41913c5fa29499d2ad8cb681a96cb. Add the template value back in. --- .../infrastructure.app/templates/ChocolateyInstallTemplate.cs | 2 +- src/chocolatey/infrastructure.app/templates/TemplateValues.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chocolatey/infrastructure.app/templates/ChocolateyInstallTemplate.cs b/src/chocolatey/infrastructure.app/templates/ChocolateyInstallTemplate.cs index 4ea5182448..cf4ffd38cc 100644 --- a/src/chocolatey/infrastructure.app/templates/ChocolateyInstallTemplate.cs +++ b/src/chocolatey/infrastructure.app/templates/ChocolateyInstallTemplate.cs @@ -41,7 +41,7 @@ public class ChocolateyInstallTemplate #file = $fileLocation #MSI - silentArgs = ""/qn /norestart /l*v `""$env:TEMP\chocolatey\$($packageName)\$($packageName).MsiInstall.log`"""" # ALLUSERS=1 DISABLEDESKTOPSHORTCUT=1 ADDDESKTOPICON=0 ADDSTARTMENU=0 + silentArgs = ""[[SilentArgs]]"" # ALLUSERS=1 DISABLEDESKTOPSHORTCUT=1 ADDDESKTOPICON=0 ADDSTARTMENU=0 validExitCodes= @(0, 3010, 1641) #OTHERS # Uncomment matching EXE type (sorted by most to least common) diff --git a/src/chocolatey/infrastructure.app/templates/TemplateValues.cs b/src/chocolatey/infrastructure.app/templates/TemplateValues.cs index e3a5b89c07..5ab827fa0e 100644 --- a/src/chocolatey/infrastructure.app/templates/TemplateValues.cs +++ b/src/chocolatey/infrastructure.app/templates/TemplateValues.cs @@ -32,7 +32,7 @@ public void set_normal() InstallerType = "EXE_MSI_OR_MSU"; Url = ""; Url64 = ""; - SilentArgs = ""; + SilentArgs = @"/qn /norestart /l*v `""$env:TEMP\chocolatey\$($packageName)\$($packageName).MsiInstall.log`"""; AutomaticPackageNotesNuspec = ""; Checksum = ""; ChecksumType = "md5";