Changeset 12109 for branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Clients.Hive.Slave.WindowsService/3.3

Timestamp:

03/03/15 14:00:38 (10 years ago)

Author:

bburlacu

Message:

#2276: Merged trunk changes.

Location:

branches/HeuristicLab.DatasetRefactor/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive.Slave.WindowsService/3.3/Program.cs (modified) (1 diff)

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Clients.Hive.Slave.WindowsService/3.3/Program.cs

@@ -29 +29 @@
     private static void Main(string[] args) {
       // Install as service, see http://stackoverflow.com/a/12703878
-      if (Environment.UserInteractive) {
-        try {
-          string parameter = string.Concat(args);
-          switch (parameter) {
-            case "--install":
-              ManagedInstallerClass.InstallHelper(new[] { Assembly.GetExecutingAssembly().Location });
-              break;
-            case "--uninstall":
-              ManagedInstallerClass.InstallHelper(new[] { "/u", Assembly.GetExecutingAssembly().Location });
-              break;
-          }
+      bool installDone = false;
+      try {
+        string parameter = string.Concat(args);
+        switch (parameter) {
+          case "--install":
+            installDone = true;
+            ManagedInstallerClass.InstallHelper(new[] { Assembly.GetExecutingAssembly().Location });
+            break;
+          case "--uninstall":
+            installDone = true;
+            ManagedInstallerClass.InstallHelper(new[] { "/u", Assembly.GetExecutingAssembly().Location });
+            break;
         }
-        catch (Exception ex) {
-          Console.WriteLine("Error on (un)install of Hive Slave service: " + Environment.NewLine + ex);
-        }
-      } else {
+      }
+      catch (Exception ex) {
+        Console.WriteLine("Error on (un)install of Hive Slave service: " + Environment.NewLine + ex);
+      }
+
+      if (!installDone) {
         ServiceBase[] ServicesToRun;
         ServicesToRun = new ServiceBase[]