fix jdk install and put in instrument apps

Author: rerpha

installation_and_upgrade/ibex_install_utils/install_tasks.py

@@ -199,7 +199,9 @@ def run_update_icp(self) -> None:
         self._server_tasks.update_icp(self.icp_in_labview_modules())
 
     def save_motor_params(self) -> None:
-        self._server_tasks.save_motor_parameters_to_file()
+        self._system_tasks.check_java_installation()
+
+        # self._server_tasks.save_motor_parameters_to_file()
 
     def run_instrument_deploy(self) -> None:
         """Deploy a full IBEX upgrade on an existing instrument."""

installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py

@@ -88,15 +88,22 @@ def check_java_installation(self) -> None:
         """
         Checks Java installation
         """
-        installer, _ = Java().find_latest()
+        installer, version = Java().find_latest()
 
         if os.path.exists(installer):
             print(f"running installer at {installer}")
-            subprocess.call(
-                f"msiexec /i {installer} "
-                "ADDLOCAL=FeatureMain,FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome "
-                'INSTALLDIR="c:\\Program Files\\Eclipse Adoptium\\" /quiet'
+
+            admin_commands = AdminCommandBuilder()
+            admin_commands.add_command(
+                f'msiexec /i "{installer}"', "ADDLOCAL=FeatureMain,FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome "
+                f'INSTALLDIR="c:\\Instrument\\apps\\JDK\\{version}" /quiet', expected_return_val=None
             )
+            log_file = admin_commands.run_all()
+
+            with open(log_file, "r") as logfile:
+                for line in logfile.readlines():
+                    print("Java update output: {}".format(line.rstrip()))
+
             self.prompt.prompt_and_raise_if_not_yes(
                 "Make sure java installed correctly.\r\n"
                 "After following the installer, ensure you close and then re-open"