From 2c2626c817800876688694ec454643375afcc3ee Mon Sep 17 00:00:00 2001
From: Simon Rose <simon.rose@ess.eu>
Date: Thu, 4 May 2023 09:11:19 +0200
Subject: [PATCH] Remove support for softIoc from iocsh
---
require-ess/tools/iocsh | 45 +++--------------------------------------
1 file changed, 3 insertions(+), 42 deletions(-)
diff --git a/require-ess/tools/iocsh b/require-ess/tools/iocsh
index 56abb27a..383006b0 100644
--- a/require-ess/tools/iocsh
+++ b/require-ess/tools/iocsh
@@ -1,7 +1,7 @@
#!/bin/bash
#
-# Copyright (c) 2004 - 2017 Paul Scherrer Institute
-# Copyright (c) 2017 - 2019 European Spallation Source ERIC
+# Copyright (c) 2004 - 2017 Paul Scherrer Institute
+# Copyright (c) 2017 - Present European Spallation Source ERIC
#
# The program is free software: you can redistribute
# it and/or modify it under the terms of the GNU General Public License
@@ -16,34 +16,6 @@
# You should have received a copy of the GNU General Public License along with
# this program. If not, see https://www.gnu.org/licenses/gpl-2.0.txt
#
-#
-# PSI original iocsh author : Dirk Zimoch
-# ESS specific iocsh author : Jeong Han Lee
-# email : han.lee@esss.se
-#
-# Add IOCSH_TOP in order to access where the iocsh is executed
-# Thursday, May 31 00:04:07 CEST 2018, jhlee
-#
-# Add PVA support to call softIOCPVA if BASE >= 7.0.1.1
-# Tuesday, October 2 14:26:49 CEST 2018, jhlee
-
-# Tweak REQUIRE PVs to be an unique per a single IOC in OS
-# Set Hostname up to 30 chars
-# Thursday, October 4 17:00:53 CEST 2018, jhlee
-#
-# 0.3.5 : Set the proper limitation of REQUIRE PV name
-# 0.3.6 : In case, we know where $0 is, sourcing setE3Env.bash by itself
-# 0.3.7 : Introduce the local mode with -l
-# 0.3.8 : Use mktemp, and protect iocsh when there is no diskspace
-# 0.3.9 : LD_BIND_NOW=1 for resolving symbols at startup.
-# 0.4.0 : - Fixed registryJLinkAdd failed pva error from base 7.0.3
-# - Enable an exit subroutine for sotfioc
-# Wednesday, September 11 17:27:59 CEST 2019
-# 0.4.1 : - Use the one BASHPID for iocsh
-# 0.4.2 : - Use the secure path within tmp, but it may create "disk full" in the long
-# term if each IOC cannot be closed properly
-# 0.4.3 : - Tune REQUIRE-* PV in order to replace - with . easily
-#
SC_SCRIPT="$(readlink -e "$0")"
SC_SCRIPTNAME=${0##*/}
@@ -51,7 +23,6 @@ SC_TOP="${SC_SCRIPT%/*}"
TMP_PATH="/tmp/systemd-private-e3-iocsh-$(whoami)"
declare -r SC_SCRIPT SC_SCRIPTNAME SC_TOP TMP_PATH
declare SC_VERSION="${E3_REQUIRE_VERSION}"
-declare BASECODE=""
# shellcheck source=require-ess/tools/iocsh_functions.bash
. "${SC_TOP}"/iocsh_functions.bash
@@ -80,8 +51,6 @@ if [ "${E3_REQUIRE_BIN}" != "${SC_TOP}" ]; then
die 2
fi
-BASECODE="$(basecode_generator)"
-
check_mandatory_env_settings
# ${BASHPID} returns iocsh PID
@@ -154,13 +123,5 @@ if [ "$REALTIME" == "RT" ]; then
printf "##\n"
fi
-if [[ ${BASECODE} -ge 07000101 ]]; then
- __PVA__="PVA"
-else
- __PVA__=""
-fi
-
-#
-#
# shellcheck disable=SC2086
-${__LOADER__}${EPICS_BASE}/bin/${EPICS_HOST_ARCH}/softIoc${__PVA__} -D ${EPICS_BASE}/dbd/softIoc${__PVA__}.dbd "${IOC_STARTUP}" 2>&1
+${__LOADER__}${EPICS_BASE}/bin/${EPICS_HOST_ARCH}/softIocPVA -D ${EPICS_BASE}/dbd/softIocPVA.dbd "${IOC_STARTUP}" 2>&1
--
GitLab