na-get-lib,exeのインストーラもパッケージリストの<SilentInstallArguments>要素を指定することでサイレントインストールできるようにした。

[applistation/AppliStation.git] / na-get-lib / NaGet.Packages.Install / Installation.cs

diff --git a/na-get-lib/NaGet.Packages.Install/Installation.cs b/na-get-lib/NaGet.Packages.Install/Installation.cs
index 229b428..869b481 100644 (file)
--- a/na-get-lib/NaGet.Packages.Install/Installation.cs
+++ b/na-get-lib/NaGet.Packages.Install/Installation.cs
@@ -136,6 +136,8 @@ namespace NaGet.Packages.Install
                                        case InstallerType.ARCHIVE:\r
                                        case InstallerType.MSI_PACKAGE:\r
                                                return true;\r
+                                       case InstallerType.EXEC_INSTALLER:\r
+                                               return ! string.IsNullOrEmpty(InstalledPackage.SilentInstallArguments);\r
                                        default:\r
                                                return false;\r
                                }\r
@@ -214,7 +216,11 @@ namespace NaGet.Packages.Install
                        try {\r
                                switch (type) {\r
                                case InstallerType.EXEC_INSTALLER:\r
-                                       hProcess = Process.Start(installerfile);\r
+                                       if (Silent) {\r
+                                               hProcess = Process.Start(installerfile, InstalledPackage.SilentInstallArguments);\r
+                                       } else {\r
+                                               hProcess = Process.Start(installerfile);\r
+                                       }\r
                                        \r
                                        break;\r
                                case InstallerType.MSI_PACKAGE:\r
@@ -273,7 +279,6 @@ namespace NaGet.Packages.Install
                                }\r
                        }\r
                        \r
-                       \r
                        int exitCode = invokeInstaller(installerFile, InstalledPackage.Type);\r
                        \r
                        installed = true;\r