From e59f9a5486de9a057bf002f856aa12c0cf3b06c3 Mon Sep 17 00:00:00 2001
From: Anders Lindh Olsson <anders.lindholsson@ess.eu>
Date: Mon, 26 Feb 2024 13:38:43 +0100
Subject: [PATCH] E3-1471: Remove setE3Env.bash
---
CHANGELOG.md | 1 +
configure/module/RULES_REQUIRE | 1 -
require-ess/tools/setE3Env.bash | 8 --------
3 files changed, 1 insertion(+), 9 deletions(-)
delete mode 100644 require-ess/tools/setE3Env.bash
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6e80eea..c5014dd7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,6 +44,7 @@ in the wrapper would cause all of the module `make` commands to fail.
* Rewrite internal linked list to have better memory safety
* Removed enabling of core dump generation and max file size limit to allow developers more flexibility (enable and set limit by calling `ulimit -S -c x` where x is max size in blocks before IOC startup)
* Remove `ARCH_FILTER` support; from now on, only `EXCLUDE_ARCHS` is used.
+* Remove `setE3Env.bash` alias (for `activate`)
## [5.0.0]
diff --git a/configure/module/RULES_REQUIRE b/configure/module/RULES_REQUIRE
index 30bca01c..a6b58a6a 100644
--- a/configure/module/RULES_REQUIRE
+++ b/configure/module/RULES_REQUIRE
@@ -9,7 +9,6 @@ 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/activate
-E3_IOC_CFG_FILES += $(E3_MODULE_SRC_PATH)/tools/setE3Env.bash
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/setE3Env.bash
deleted file mode 100644
index 1b808d2f..00000000
--- a/require-ess/tools/setE3Env.bash
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-# This file exists for (temporary) backwards compatability
-echo "setE3Env.bash has been deprecated, please use activate instead" >&2
-
-DIR="${BASH_SOURCE[0]%/*}"
-# shellcheck source=require-ess/tools/activate
-. "$DIR"/activate
--
GitLab