From f8588de83b4fd347fd1953a525ebfd5799d3c647 Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Mon, 15 May 2023 10:07:08 +0200
Subject: [PATCH] set PATH containing EPICS base bin location before calling
 init scripts and starting ioc

---
 iocsh | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/iocsh b/iocsh
index 4d6303d..9b9d11b 100755
--- a/iocsh
+++ b/iocsh
@@ -319,6 +319,9 @@ then
 fi
 export EPICS_DRIVER_PATH
 
+# setup search PATH (Windows needs it for libraries, but also find helper programs like msi)
+PATH=$PATH:$INSTBASE/iocBoot/R$BASE/$EPICS_HOST_ARCH:$EPICS_BASE/bin/$EPICS_HOST_ARCH:$EPICS_BASE/../seq/bin/$EPICS_HOST_ARCH
+
 # Call init script after IOC name, EPICS_HOST_ARCH and EPICS_BASE are set.
 for dir in . cfg /etc
 do
@@ -447,7 +450,7 @@ trap "stty sane 2> /dev/null;echo;rm -f $startup;$(trap -p EXIT | sed 's/.*\x27\
 {
 echo "# date=\"$(date)\""
 echo "# user=\"${USER:-$(whoami)}\""
-for var in IOC PWD BASE EPICS_HOST_ARCH SHELLBOX EPICS_CA_ADDR_LIST EPICS_DRIVER_PATH
+for var in IOC PWD BASE EPICS_HOST_ARCH SHELLBOX EPICS_CA_ADDR_LIST EPICS_DRIVER_PATH PATH LD_LIBRARY_PATH
 do
     echo "# $var=\"${!var}\""
 done
@@ -519,11 +522,6 @@ then
     startup=`cygpath -w $startup`
 fi
 
-if [ "${EPICS_HOST_ARCH#win32-}" != "$EPICS_HOST_ARCH" -o "${EPICS_HOST_ARCH#cygwin-}" != "$EPICS_HOST_ARCH" ]
-then
-    PATH=$INSTBASE/iocBoot/R$BASE/$EPICS_HOST_ARCH:$EPIC_BASE/bin/$EPICS_HOST_ARCH:$EPICS_BASE/../seq/bin/$EPICS_HOST_ARCH:$PATH
-fi
-
 echo $EXE $ARGS $startup
 #enable core dumps
 ulimit -c unlimited