From 1d6796bce0257cd0e9891ce617e5f6de0600e427 Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Thu, 11 Sep 2025 11:39:42 +0100 Subject: [PATCH 1/5] fix jdk install and put in instrument apps --- .../ibex_install_utils/install_tasks.py | 4 +++- .../ibex_install_utils/tasks/system_tasks.py | 17 ++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/installation_and_upgrade/ibex_install_utils/install_tasks.py b/installation_and_upgrade/ibex_install_utils/install_tasks.py index 3c5da87..044ffe1 100644 --- a/installation_and_upgrade/ibex_install_utils/install_tasks.py +++ b/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.""" diff --git a/installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py b/installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py index 8c23c05..836e560 100644 --- a/installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py +++ b/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" From 63ffd9f4ba2b22df4a4e6a718a15f3a3ecda722c Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Thu, 11 Sep 2025 11:48:15 +0100 Subject: [PATCH 2/5] ruff --- .../ibex_install_utils/tasks/system_tasks.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py b/installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py index 836e560..dc07b27 100644 --- a/installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py +++ b/installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py @@ -1,7 +1,6 @@ import glob import os import shutil -import subprocess import tempfile import time from pathlib import Path @@ -9,6 +8,8 @@ import psutil import requests +from win32com.client import Dispatch + from ibex_install_utils.admin_runner import AdminCommandBuilder from ibex_install_utils.exceptions import ErrorInTask, UserStop from ibex_install_utils.kafka_utils import add_required_topics @@ -19,7 +20,6 @@ from ibex_install_utils.tasks import BaseTasks from ibex_install_utils.tasks.common_paths import APPS_BASE_DIR, EPICS_PATH, UV, VAR_DIR from ibex_install_utils.version_check import version_check -from win32com.client import Dispatch GIGABYTE = 1024**3 @@ -95,8 +95,10 @@ def check_java_installation(self) -> None: 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 + 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() From 6722437066fb0488f8772dc4b4cf4f382ce80653 Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Thu, 11 Sep 2025 11:50:09 +0100 Subject: [PATCH 3/5] ruff but from root --- .../ibex_install_utils/tasks/system_tasks.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py b/installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py index dc07b27..1dad9fe 100644 --- a/installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py +++ b/installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py @@ -8,8 +8,6 @@ import psutil import requests -from win32com.client import Dispatch - from ibex_install_utils.admin_runner import AdminCommandBuilder from ibex_install_utils.exceptions import ErrorInTask, UserStop from ibex_install_utils.kafka_utils import add_required_topics @@ -20,6 +18,7 @@ from ibex_install_utils.tasks import BaseTasks from ibex_install_utils.tasks.common_paths import APPS_BASE_DIR, EPICS_PATH, UV, VAR_DIR from ibex_install_utils.version_check import version_check +from win32com.client import Dispatch GIGABYTE = 1024**3 From aa64b50b079b13ed68194aaad7147cedcc1922ab Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Thu, 11 Sep 2025 11:59:38 +0100 Subject: [PATCH 4/5] pull out JDK location to constant --- .../ibex_install_utils/tasks/system_tasks.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py b/installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py index 1dad9fe..7451132 100644 --- a/installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py +++ b/installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py @@ -45,6 +45,7 @@ EPICS_CRTL_PATH = os.path.join(EPICS_PATH, "crtl") +JAVA_INSTALL_BASE_PATH = os.path.join(APPS_BASE_DIR, "JDK") DESKTOP_TRAINING_FOLDER_PATH = os.path.join( os.environ["userprofile"], "desktop", "Mantid+IBEX training" @@ -96,14 +97,10 @@ def check_java_installation(self) -> None: admin_commands.add_command( f'msiexec /i "{installer}"', "ADDLOCAL=FeatureMain,FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome " - f'INSTALLDIR="c:\\Instrument\\apps\\JDK\\{version}" /quiet', + f'INSTALLDIR="{os.path.join(JAVA_INSTALL_BASE_PATH, 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())) + admin_commands.run_all() self.prompt.prompt_and_raise_if_not_yes( "Make sure java installed correctly.\r\n" From cff768c61fffe74ace234c3ff82c199ed6f17ebf Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Mon, 6 Oct 2025 13:07:05 +0100 Subject: [PATCH 5/5] Update install_tasks.py --- installation_and_upgrade/ibex_install_utils/install_tasks.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/installation_and_upgrade/ibex_install_utils/install_tasks.py b/installation_and_upgrade/ibex_install_utils/install_tasks.py index 044ffe1..3c5da87 100644 --- a/installation_and_upgrade/ibex_install_utils/install_tasks.py +++ b/installation_and_upgrade/ibex_install_utils/install_tasks.py @@ -199,9 +199,7 @@ def run_update_icp(self) -> None: self._server_tasks.update_icp(self.icp_in_labview_modules()) def save_motor_params(self) -> None: - self._system_tasks.check_java_installation() - - # self._server_tasks.save_motor_parameters_to_file() + self._server_tasks.save_motor_parameters_to_file() def run_instrument_deploy(self) -> None: """Deploy a full IBEX upgrade on an existing instrument."""