From 993bc6559b1e9b4db4a27db40ad0314b6d0e071b Mon Sep 17 00:00:00 2001 From: Xiaoqiang Wang Date: Mon, 16 Dec 2019 14:28:42 +0100 Subject: [PATCH] prefer 'read' instead of meddling IFS --- iocsh | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/iocsh b/iocsh index 914c4fd..e554172 100755 --- a/iocsh +++ b/iocsh @@ -52,15 +52,6 @@ rp() { ( realpath $1 || readlink -f $1 || readlink $1 || (cd -P $1 && echo $PWD) || (x=$(\ls -ld $1) && echo ${x##* }) || echo $1 ) 2>/dev/null } -# convert unix path to windows path -unix2win() { - # add z: prefix to absolute path - p=${1/#\//z:\//} - # replace '/' with '\' - p=${p//\//\\\\} - echo $1 -} - # if EPICS_HOST_ARCH is not set guess it if [ -z "$EPICS_HOST_ARCH" ] then @@ -418,10 +409,9 @@ if [[ $EXEPOSTFIX == ".exe" ]] then LOADER="wine" EPICS_DRIVER_PATH_WIN= - IFS=: - for p in $EPICS_DRIVER_PATH; do - EPICS_DRIVER_PATH_WIN="$EPICS_DRIVER_PATH_WIN;$(unix2win $p)" - done + while read -d ':' p; do + EPICS_DRIVER_PATH_WIN="$EPICS_DRIVER_PATH_WIN;${p/#\//z:/}" + done <<< "$EPICS_DRIVER_PATH:" EPICS_DRIVER_PATH=${EPICS_DRIVER_PATH_WIN#;} fi