Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
e3-require
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Anders Lindh Olsson
e3-require
Commits
2c2626c8
Commit
2c2626c8
authored
1 year ago
by
Simon Rose
Browse files
Options
Downloads
Patches
Plain Diff
Remove support for softIoc from iocsh
parent
d5051870
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
require-ess/tools/iocsh
+3
-42
3 additions, 42 deletions
require-ess/tools/iocsh
with
3 additions
and
42 deletions
require-ess/tools/iocsh
+
3
−
42
View file @
2c2626c8
#!/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
}
/softIoc
PVA
-D
${
EPICS_BASE
}
/dbd/softIoc
PVA
.dbd
"
${
IOC_STARTUP
}
"
2>&1
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment