diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 002d2314c063d5dccce89d47624c72a0632953ad..9327768bd1dc9c689e2abdf8d9ce4161c247207d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -65,7 +65,7 @@ build require: test require: stage: test before_script: - - source $(pwd)/epics/base-*/require/*/bin/setE3Env.bash + - source $(pwd)/epics/base-*/require/*/bin/activate script: - make test needs: diff --git a/CHANGELOG.md b/CHANGELOG.md index c5f134900048553d6767f04fabb207a9fb787681..4e1a87cb1297b2503d8116636cf000151006e25c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * Remove `/tools` directory, including `test_installed_modules.sh` utility * Remove `runScript` * Drop file extension from `build_number.sh` +* Rename `setE3Env.bash` to `activate` ## [4.0.0] diff --git a/README.md b/README.md index 977a73ce7d8c5855d8f89f244fe4543fa9e04fd9..66c136f167607f977360e60c3de42810bb05dfac 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ $ make install To test your build, run ```bash -$ source ${EPICS_BASE}/require/${E3_REQUIRE_VERSION}/bin/setE3Env.bash +$ source ${EPICS_BASE}/require/${E3_REQUIRE_VERSION}/bin/activate $ iocsh ``` diff --git a/configure/module/RULES_REQUIRE b/configure/module/RULES_REQUIRE index f5c33b927fc1aabf3abda9b30a5092d8f86f2456..ce1d9799d6286b5c24069a31c907602414ec5dc4 100644 --- a/configure/module/RULES_REQUIRE +++ b/configure/module/RULES_REQUIRE @@ -8,7 +8,7 @@ FILE_FILTER:= %~ %\# E3_TEST_SCRIPT := $(TOP)/tools/test_installed_modules.sh # E3_SHELL_FILES := $(wildcard $(E3_MODULE_SRC_PATH)/tools/iocsh*) -E3_IOC_CFG_FILES += $(E3_MODULE_SRC_PATH)/tools/setE3Env.bash +E3_IOC_CFG_FILES += $(E3_MODULE_SRC_PATH)/tools/activate E3_IOC_CFG_FILES += $(E3_MODULE_SRC_PATH)/tools/promptE3Env.bash E3_REQUIRE_CONF_FILES := $(filter-out $(FILE_FILTER), $(wildcard $(TOP)/configure/E3/*)) diff --git a/require-ess/tools/setE3Env.bash b/require-ess/tools/activate similarity index 99% rename from require-ess/tools/setE3Env.bash rename to require-ess/tools/activate index 4b685043395ecad57c26166c3a7eb31f2ebbf045..f9ee5607219871edce3d300316e158c844f448f6 100644 --- a/require-ess/tools/setE3Env.bash +++ b/require-ess/tools/activate @@ -16,7 +16,6 @@ # You should have received a copy of the GNU General Public License along with # this program. If not, see https://www.gnu.org/licenses/gpl-2.0.txt # -# Shell : setE3Env.bash # Author : Jeong Han Lee # email : jeonghan.lee@gmail.com # date : Friday, November 8 22:48:29 CET 2019 diff --git a/require-ess/tools/iocsh b/require-ess/tools/iocsh index ac58d761cf579d8e9c5c477c4533bd38813bb23f..56abb27a7c0f8764418c4b078fdbc765b79c4347 100644 --- a/require-ess/tools/iocsh +++ b/require-ess/tools/iocsh @@ -63,8 +63,8 @@ IOCSH_TOP=${PWD} # if [[ -z "${EPICS_DRIVER_PATH}" ]]; then set -a - # shellcheck source=require-ess/tools/setE3Env.bash - . "${SC_TOP}"/setE3Env.bash "no_msg" + # shellcheck source=require-ess/tools/activate + . "${SC_TOP}"/activate "no_msg" set +a fi @@ -72,7 +72,7 @@ fi # are consistent if [ "${E3_REQUIRE_BIN}" != "${SC_TOP}" ]; then echo "Error: Configured e3 environment does not match path for iocsh executable." - echo "Please source the appropriate setE3Env.bash file for the version of iocsh" + echo "Please source the appropriate activation file for the version of iocsh" echo "you wish to use, or run iocsh from a clean environment so it can set the" echo "environment correctly." echo "Expected path to iocsh from environment = ${E3_REQUIRE_BIN}" diff --git a/require-ess/tools/iocsh_functions.bash b/require-ess/tools/iocsh_functions.bash index 75a6dd6d561031f1a59c58f2747da75375e3b06a..52594f9c4a6bf0d915cb7e58bc443c8130fcf109 100644 --- a/require-ess/tools/iocsh_functions.bash +++ b/require-ess/tools/iocsh_functions.bash @@ -239,7 +239,7 @@ function check_mandatory_env_settings() { var_list+=(E3_REQUIRE_VERSION) for var in "${var_list[@]}"; do if [[ -z "${!var}" ]]; then - die 1 " $var is not defined!. Please source ${E3_REQUIRE_BIN}/setE3Env.bash " + die 1 " $var is not defined!. Please source ${E3_REQUIRE_BIN}/activate" fi done diff --git a/require-ess/tools/promptE3Env.bash b/require-ess/tools/promptE3Env.bash index 98dc0f7ac46c45e774456dee524743cd833bc753..7636ac06784de6c271ade1b7414ddcd8656ffb7d 100644 --- a/require-ess/tools/promptE3Env.bash +++ b/require-ess/tools/promptE3Env.bash @@ -8,8 +8,8 @@ # DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" -# shellcheck source=require-ess/tools/setE3Env.bash -source "$DIR"/setE3Env.bash +# shellcheck source=require-ess/tools/activate +source "$DIR"/activate IFS='/' read -ra base <<<"$EPICS_BASE" PS1="(EPICS-${base[-1]})$PS1"