diff --git a/require-ess/tools/setE3Env.bash b/require-ess/tools/setE3Env.bash index d8294f4a07582328dbf364695d9d9368061de37b..d2ddc29644646da4b07e28079b081599e4f4e7a9 100644 --- a/require-ess/tools/setE3Env.bash +++ b/require-ess/tools/setE3Env.bash @@ -184,35 +184,35 @@ SRC_NAME=${THIS_SRC##*/} # declare -g DEFAULT_REQUIRE_NAME=require # declare -g DEFAULT_REQUIRE_VERSION=3.4.1 -GENERATED_E3_CFG=$SRC_PATH/e3.cfg +## GENERATED_E3_CFG=$SRC_PATH/e3.cfg # don't install e3.cfg when make install is executed, # so all varaibles are found according to the existent location # the symbolic link path doesn't work # -if [ ! -f "${GENERATED_E3_CFG}" ]; then - - E3_REQUIRE_LOCATION=${SRC_PATH%/*} - E3_REQUIRE_VERSION=${E3_REQUIRE_LOCATION##*/} - E3_REQUIRE_PATH=${E3_REQUIRE_LOCATION%/*} - E3_REQUIRE_NAME=${E3_REQUIRE_PATH##*/} - EPICS_BASE=${E3_REQUIRE_PATH%/*} - -else - - # in e3-require/tools - # in case, source within e3-require - set -a - # shellcheck disable=SC1090,SC1091 - source "$GENERATED_E3_CFG" - set +a - - EPICS_BASE=${DEFAULT_EPICS_BASE} - E3_REQUIRE_NAME=${DEFAULT_REQUIRE_NAME} - E3_REQUIRE_VERSION=${DEFAULT_REQUIRE_VERSION} - E3_REQUIRE_LOCATION=${EPICS_BASE}/${E3_REQUIRE_NAME}/${E3_REQUIRE_VERSION} +##if [ ! -f "${GENERATED_E3_CFG}" ]; then + +E3_REQUIRE_LOCATION=${SRC_PATH%/*} +E3_REQUIRE_VERSION=${E3_REQUIRE_LOCATION##*/} +E3_REQUIRE_PATH=${E3_REQUIRE_LOCATION%/*} +E3_REQUIRE_NAME=${E3_REQUIRE_PATH##*/} +EPICS_BASE=${E3_REQUIRE_PATH%/*} + +##else + +# # in e3-require/tools +# # in case, source within e3-require +# set -a +# # shellcheck disable=SC1090,SC1091 +# source "$GENERATED_E3_CFG" +# set +a +# +# EPICS_BASE=${DEFAULT_EPICS_BASE} +# E3_REQUIRE_NAME=${DEFAULT_REQUIRE_NAME} +# E3_REQUIRE_VERSION=${DEFAULT_REQUIRE_VERSION} +# E3_REQUIRE_LOCATION=${EPICS_BASE}/${E3_REQUIRE_NAME}/${E3_REQUIRE_VERSION} -fi +#fi epics_host_arch_file="${EPICS_BASE}/startup/EpicsHostArch.pl" if [ -e "$epics_host_arch_file" ]; then