Skip to content

Commit b479969

Browse files
committed
remove seci and treesize prompts
1 parent 4a7b291 commit b479969

File tree

3 files changed

+0
-68
lines changed

3 files changed

+0
-68
lines changed

installation_and_upgrade/ibex_install_utils/install_tasks.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,6 @@ def run_instrument_install(self) -> None:
169169
self._system_tasks.install_or_upgrade_git()
170170
self._system_tasks.check_java_installation()
171171

172-
self._system_tasks.remove_seci_shortcuts()
173-
self._system_tasks.remove_seci_one()
174-
self._system_tasks.remove_treesize_shortcuts()
175172
self._system_tasks.restrict_ie()
176173

177174
self._server_tasks.install_ibex_server()
@@ -222,7 +219,6 @@ def run_instrument_deploy_post_start(self) -> None:
222219
self._server_tasks.perform_server_tests()
223220
self._server_tasks.run_config_checker()
224221
self._server_tasks.save_motor_blocks_blockserver_to_file()
225-
self._server_tasks.set_alert_url_and_password()
226222
self._system_tasks.put_autostart_script_in_startup_area()
227223
self._system_tasks.inform_instrument_scientists()
228224

installation_and_upgrade/ibex_install_utils/tasks/server_tasks.py

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -633,24 +633,6 @@ def update_icp(self, icp_in_labview_modules: bool, register_icp: bool = True) ->
633633
else:
634634
print("Not registering ICP as running a non-interactive deploy")
635635

636-
@task(
637-
"Set username and password for alerts (only required if this is a SECI to IBEX migration)"
638-
)
639-
def set_alert_url_and_password(self) -> None:
640-
print(
641-
"The URL and password for alerts are at http://www.facilities.rl.ac.uk/isis/computing/instruments/Lists/Access/AllItems.aspx"
642-
)
643-
url = self.prompt.prompt("Input URL for alerts: ", possibles=UserPrompt.ANY, default=None)
644-
password = self.prompt.prompt(
645-
"Input password for alerts: ", possibles=UserPrompt.ANY, default=None
646-
)
647-
648-
if url is not None and password is not None:
649-
self._ca.set_pv("CS:AC:ALERTS:URL:SP", url, is_local=True)
650-
self._ca.set_pv("CS:AC:ALERTS:PW:SP", password, is_local=True)
651-
else:
652-
print("No username/password provided - skipping step")
653-
654636
@task("Run config checker")
655637
def run_config_checker(self) -> None:
656638
with tempfile.TemporaryDirectory() as tmpdir:

installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@
4242
"C:\\", "ProgramData", "Microsoft", "Windows", "Start Menu", "Programs", "Startup"
4343
)
4444

45-
SECI = "SECI User interface.lnk"
46-
SECI_ONE_PATH = os.path.join("C:\\", "Program Files (x86)", "CCLRC ISIS Facility")
47-
SECI_AUTOSTART_LOCATIONS = [os.path.join(USER_STARTUP, SECI), os.path.join(ALLUSERS_STARTUP, SECI)]
4845
EPICS_CRTL_PATH = os.path.join(EPICS_PATH, "crtl")
4946

5047

@@ -83,49 +80,6 @@ def clean_up_desktop_ibex_training_folder(self) -> None:
8380
"""
8481
self._file_utils.remove_tree(DESKTOP_TRAINING_FOLDER_PATH, self.prompt)
8582

86-
@task("Remove SECI shortcuts")
87-
def remove_seci_shortcuts(self) -> None:
88-
"""
89-
Remove (or at least ask the user to remove) all Seci shortcuts
90-
"""
91-
for path in SECI_AUTOSTART_LOCATIONS:
92-
if os.path.exists(path):
93-
self.prompt.prompt_and_raise_if_not_yes(
94-
f"SECI autostart found in {path}, delete this."
95-
)
96-
97-
self.prompt.prompt_and_raise_if_not_yes("Remove task bar shortcut to SECI")
98-
self.prompt.prompt_and_raise_if_not_yes("Remove desktop shortcut to SECI")
99-
self.prompt.prompt_and_raise_if_not_yes("Remove start menu shortcut to SECI")
100-
101-
@task("Remove Treesize shortcuts")
102-
def remove_treesize_shortcuts(self) -> None:
103-
"""
104-
Remove (or at least ask the user to remove) all Treesize shortcuts.
105-
106-
For justification see https://github.com/ISISComputingGroup/IBEX/issues/4214
107-
"""
108-
self.prompt.prompt_and_raise_if_not_yes("Remove task bar shortcut to Treesize if it exists")
109-
self.prompt.prompt_and_raise_if_not_yes("Remove desktop shortcut to Treesize if it exists")
110-
self.prompt.prompt_and_raise_if_not_yes(
111-
"Remove start menu shortcut to Treesize if it exists"
112-
)
113-
114-
@task("Remove SECI 1 Path")
115-
def remove_seci_one(self) -> None:
116-
"""
117-
Removes SECI 1
118-
"""
119-
if os.path.exists(SECI_ONE_PATH):
120-
try:
121-
self._file_utils.remove_tree(SECI_ONE_PATH, self.prompt, use_robocopy=False)
122-
except (IOError, WindowsError) as e:
123-
self.prompt.prompt_and_raise_if_not_yes(
124-
f"Failed to remove SECI 1 (located in '{SECI_ONE_PATH}') "
125-
f"because '{e}'. Please remove it manually and type 'Y'"
126-
f" to confirm"
127-
)
128-
12983
@version_check(Java())
13084
@task("Install java")
13185
def check_java_installation(self) -> None:

0 commit comments

Comments
 (0)