Rename `setE3Env.bash` to `activate`

.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:

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]
 

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
 ```
 

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/*))
 

require-ess/tools/setE3Env.bash → 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

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}"

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
 

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"