Allow chef to be installed in nonstandard location

mhedgpeth · Mar 5, 2017 · 0604f5c · 0604f5c
1 parent 06ac70d
commit 0604f5c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/cafe/Chef/ChefInstaller.cs b/src/cafe/Chef/ChefInstaller.cs
@@ -18,14 +18,16 @@ public class ProductInstaller : IProductInstaller
         private readonly IFileSystem _fileSystem;
         private readonly IFileSystemCommands _commands;
         private readonly string _prefix;
+        private readonly string _installLocation;
         private readonly ProcessExecutor _processExecutor;
 
-        public ProductInstaller(IFileSystem fileSystem, ProcessExecutor processExecutor, IFileSystemCommands commands, string prefix)
+        public ProductInstaller(IFileSystem fileSystem, ProcessExecutor processExecutor, IFileSystemCommands commands, string prefix, string installLocation)
         {
             _fileSystem = fileSystem;
             _processExecutor = processExecutor;
             _commands = commands;
             _prefix = prefix;
+            _installLocation = installLocation;
         }
 
         public Result Uninstall(string productCode)
@@ -47,7 +49,7 @@ public Result Install(string version)
             }
             Logger.Debug($"Installing installer {fullPathToStagedInstaller}");
             var msiexec = FindFullPathToMsiExec();
-            var result = _processExecutor.ExecuteAndWaitForExit(msiexec, $"/qn /L*V \"logs/installation.log\" /i \"{fullPathToStagedInstaller}\"",
+            var result = _processExecutor.ExecuteAndWaitForExit(msiexec, $"/qn /L*V \"logs/installation.log\" /i \"{fullPathToStagedInstaller}\" INSTALLLOCATION={_installLocation}",
                 LogInformation, LogError);
             Logger.Debug($"Result of installing {fullPathToStagedInstaller} is {result}");
             return result;

diff --git a/src/cafe/Server/Controllers/InspecController.cs b/src/cafe/Server/Controllers/InspecController.cs
@@ -30,7 +30,7 @@ public static InspecJobRunner CreateJobRunner()
         public static InstallJob CreateInstallJob(string product, FileSystem fileSystem, FileSystemCommandsBoundary commands, string prefix, Func<ProductInstallationMetaData, bool> productMatcher)
         {
             var chefProduct = new ChefProduct(product, new InstalledProductsFinder(),
-                new ProductInstaller(fileSystem, new ProcessExecutor(() => new ProcessBoundary()), commands, prefix),
+                new ProductInstaller(fileSystem, new ProcessExecutor(() => new ProcessBoundary()), commands, prefix, $@"{ServerSettings.Instance.InstallRoot}\opscode"),
                 productMatcher);
             return new InstallJob(chefProduct, SystemClock.Instance);
         }

diff --git a/src/cafe/ServerSettings.cs b/src/cafe/ServerSettings.cs
@@ -4,6 +4,7 @@ public class ServerSettings
     {
         public int ChefInterval { get; set; }
         public int Port { get; set; } = DefaultPort;
+        public string InstallRoot { get; set; } = @"C:";
 
         public const int DefaultPort = 59320;
 

diff --git a/src/cafe/server.json b/src/cafe/server.json
@@ -1,4 +1,5 @@
 {
     "ChefInterval": 0,
-    "Port": 59320
+    "Port": 59320,
+    "InstallRoot": "C:"
 }