From 1c9689bf952f677d51d4dab0cb702b377415054a Mon Sep 17 00:00:00 2001
From: Juntong Liu <juntong.liu@ess.eu>
Date: Thu, 20 Jan 2022 08:47:20 +0000
Subject: [PATCH] iocsh_bash_id -> iocsh_id, iocsh_bash_completion ->
iocsh_completion
---
require-ess/tools/iocsh | 10 +++++-----
require-ess/tools/iocsh_complete.bash | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/require-ess/tools/iocsh b/require-ess/tools/iocsh
index b5ded14a..9201e0bb 100644
--- a/require-ess/tools/iocsh
+++ b/require-ess/tools/iocsh
@@ -85,14 +85,14 @@ BASECODE="$(basecode_generator)"
check_mandatory_env_settings
# ${BASHPID} returns iocsh PID
-iocsh_bash_id=${BASHPID}
+iocsh_id=${BASHPID}
#
-SC_VERSION+=-PID-${iocsh_bash_id}
+SC_VERSION+=-PID-${iocsh_id}
#
-# We define HOSTNAME + iocsh_bash_id
-IOCSH_PS1=$(iocsh_ps1 "${iocsh_bash_id}")
-REQUIRE_IOC=$(require_ioc "${iocsh_bash_id}")
+# We define HOSTNAME + iocsh_id
+IOCSH_PS1=$(iocsh_ps1 "${iocsh_id}")
+REQUIRE_IOC=$(require_ioc "${iocsh_id}")
#
# Default Initial Startup file for REQUIRE and minimal environment
# Create TMP_PATH path in order to keep tmp files secure until
diff --git a/require-ess/tools/iocsh_complete.bash b/require-ess/tools/iocsh_complete.bash
index d312c929..c3dfe1e6 100644
--- a/require-ess/tools/iocsh_complete.bash
+++ b/require-ess/tools/iocsh_complete.bash
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-_iocsh_bash_completion() {
+_iocsh_completion() {
local cur prev opts mods
COMPREPLY=()
cur="${COMP_WORDS[COMP_CWORD]}"
@@ -38,4 +38,4 @@ _iocsh_bash_completion() {
mapfile -t COMPREPLY < <(compgen -f -- "${cur}")
}
-complete -o filenames -o nospace -o bashdefault -F _iocsh_bash_completion iocsh
+complete -o filenames -o nospace -o bashdefault -F _iocsh_completion iocsh
--
GitLab