Merge branch 'iocsh-iocname' into 'master'

E3-464: Change iocsh PS1 to show IOCNAME

See merge request e3/e3-require!103

require-ess/tools/iocsh_functions.bash

@@ -158,12 +158,14 @@ function die() { #@ Print error message and exit with error code
 function iocsh_ps1() {
   local iocsh_ps1=""
   local pid="$1"
-  # Keep only short hostname (without domain)
-  local host=${HOSTNAME%%.*}
 
-  iocsh_ps1+=${host:0:15}
-  iocsh_ps1+="-"
-  iocsh_ps1+=$pid
+  # If IOCNAME is not set use pid instead
+  if [ -z "${IOCNAME}" ]; then
+    iocsh_ps1+=${pid}
+  else
+    iocsh_ps1+="${IOCNAME}"
+  fi
+
   iocsh_ps1+=" > "
 
   echo "${iocsh_ps1}"