Re-added automatic source-ing of setE3Env.bash

tools/iocsh.bash

@@ -61,6 +61,14 @@ IOCSH_TOP=${PWD}
 # Load any environment variables, default is $IOCSH_TOP/env.sh
 loadEnv "$@"
 
+# The most unique environment variable for e3 is EPICS_DRIVER_PATH
+#
+if [[ $(checkIfVar ${EPICS_DRIVER_PATH}) -eq "$NON_EXIST" ]]; then
+    set -a
+    . ${SC_TOP}/setE3Env.bash "no_msg"
+    set +a
+fi
+
 BASECODE="$(basecode_generator)"
 
 check_mandatory_env_settings

tools/iocsh_functions

@@ -324,7 +324,7 @@ function check_mandatory_env_settings() {
     var_list+=(E3_REQUIRE_VERSION)
     for var in ${var_list[@]}; do
         if [[ $(checkIfVar ${!var}) -eq "$NON_EXIST" ]]; then
-            die 1 " $var is not defined!. Please run conda activate <env> "
+            die 1 " $var is not defined!. Please source ${E3_REQUIRE_BIN}/setE3Env.bash "
         fi
     done
 }