Skip to content

Commit e6c057b

Browse files
authored
Merge pull request #211 from ISISComputingGroup/add_standalone_isisicp
add standalone isisicp installer
2 parents 1b7636e + 9e37dbc commit e6c057b

File tree

2 files changed

+29
-0
lines changed

2 files changed

+29
-0
lines changed

installation_and_upgrade/ibex_install_utils/install_tasks.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,9 @@ def run_instrument_install(self) -> None:
200200
self._python_tasks.update_script_definitions()
201201
self._server_tasks.setup_log_rotation()
202202

203+
def run_update_icp(self) -> None:
204+
self._server_tasks.update_icp(self.icp_in_labview_modules())
205+
203206
def save_motor_params(self) -> None:
204207
self._server_tasks.save_motor_parameters_to_file()
205208

@@ -406,6 +409,10 @@ def run_vhd_post_install(self) -> None:
406409
UpgradeInstrument.run_truncate_database,
407410
"backup and truncate the sql database on the instrument",
408411
),
412+
"update_icp": (
413+
UpgradeInstrument.run_update_icp,
414+
"update isisicp on the instrument",
415+
),
409416
"force_upgrade_mysql": (
410417
UpgradeInstrument.run_force_upgrade_mysql,
411418
"upgrade mysql version to latest and recreate tables",
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
setlocal EnableDelayedExpansion
2+
set "SOURCE=\\isis.cclrc.ac.uk\inst$\Kits$\CompGroup\ICP\Releases"
3+
call "%~dp0define_latest_genie_python.bat"
4+
IF %errorlevel% neq 0 goto ERROR
5+
6+
git --version
7+
8+
IF %errorlevel% neq 0 (
9+
echo No installation of Git found on machine. Please download Git from https://git-scm.com/downloads before proceeding.
10+
goto ERROR
11+
)
12+
13+
call "%LATEST_PYTHON%" "%~dp0IBEX_upgrade.py" --release_dir "%SOURCE%" --release_suffix "%SUFFIX%" --confirm_step update_icp
14+
IF %errorlevel% neq 0 goto ERROR
15+
call "%~dp0remove_genie_python.bat" %LATEST_PYTHON_DIR%
16+
17+
exit /b 0
18+
19+
:ERROR
20+
set errcode = %ERRORLEVEL%
21+
call "%~dp0remove_genie_python.bat" %LATEST_PYTHON_DIR%
22+
EXIT /b !errcode!

0 commit comments

Comments
 (0)