From 5b878ccf59b60cbe729e5f5c47d0c8c42c8a17a6 Mon Sep 17 00:00:00 2001 From: zimoch Date: Wed, 11 Mar 2015 10:54:35 +0000 Subject: [PATCH] accept both, softIoc.dbd and old base.dbd as basic dbd files --- externalLinks | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/externalLinks b/externalLinks index 9208a2d..99b3124 100755 --- a/externalLinks +++ b/externalLinks @@ -4,8 +4,8 @@ version () { echo '$Author: zimoch $' >&2 - echo '$Date: 2013/12/05 15:30:27 $' >&2 - echo '$Revision: 1.15 $' >&2 + echo '$Date: 2015/03/11 10:54:35 $' >&2 + echo '$Revision: 1.16 $' >&2 echo '$Source: /cvs/G/EPICS/App/scripts/externalLinks,v $' >&2 exit 1 } @@ -99,10 +99,14 @@ function expandFile () { echo "FILENAME $CONVERT" cat $CONVERT fi - MAINDBD=$INSTBASE/iocBoot/R${EPICS}/dbd/base.dbd + MAINDBD=/usr/local/epics/base-${EPICS}/dbd/softIoc.dbd if [ ! -r $MAINDBD ] then - echo "can't find $MAINDBD" >&2 + MAINDBD=$INSTBASE/iocBoot/R${EPICS}/dbd/base.dbd + fi + if [ ! -r $MAINDBD ] + then + echo "can't find base.dbd or softIoc.dbd" >&2 exit 1 fi echo "FILENAME $MAINDBD base"