Move the installation logic to the installer, not the bootstrapper

Author: samhocevar

bootstrapper/bootstrapper.cs

@@ -2,6 +2,7 @@
 using chocolatey.infrastructure.logging;
 using System;
 using System.Diagnostics;
+using System.Linq;
 using System.Reflection;
 using System.Security.Principal;
 
@@ -25,10 +26,8 @@ static void Main(string[] args)
             var choco = Lets.GetChocolatey();
             choco.SetCustomLogging(new NullLog());
 
-            choco.Set(conf => conf.CommandName = "upgrade");
-            choco.RunConsole(new string[] { "-y", "--force", "chocolatey" });
-            choco.Set(conf => conf.CommandName = "upgrade");
-            choco.RunConsole(new string[] { "-y", "--force", "chocolateygui" });
+            choco.Set(conf => conf.CommandName = args.FirstOrDefault());
+            choco.RunConsole(args.Skip(1).ToArray());
         }
 
         static bool IsAdministrator()

installer.iss

@@ -31,10 +31,21 @@ DisableDirPage=yes
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
+[Types]
+Name: "full"; Description: "Full installation"
+Name: "custom"; Description: "Custom installation"; Flags: iscustom
+
+[Components]
+Name: "chocolatey"; Description: "Chocolatey"; Types: custom full; Flags: fixed
+Name: "chocolateygui"; Description: "Graphical Interface for Chocolatey"; Types: custom full
+
 [Files]
 Source: "{#BuildDirectory}/bootstrapper.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#BuildDirectory}/chocolatey.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#BuildDirectory}/log4net.dll"; DestDir: "{app}"; Flags: ignoreversion
 
 [Run]
-Filename: "{app}\bootstrapper.exe"; Flags: runascurrentuser runhidden
+Filename: "{app}\bootstrapper.exe"; Parameters: "upgrade -y --force chocolatey"; \
+    Flags: runascurrentuser runhidden; Components: chocolatey
+Filename: "{app}\bootstrapper.exe"; Parameters: "upgrade -y --force chocolateygui"; \
+    Flags: runascurrentuser runhidden; Components: chocolateygui