summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2023-02-26 23:14:02 +0000
committerUlrich Müller <ulm@gentoo.org>2023-02-27 00:38:35 +0100
commit69150409a534e24107cccc080c5650bbd12bcc8e (patch)
treec24c38039ee5b9b3401cf250b00a0ba5466e5371
parenteselect-mode: Remove eselect-mode-make-keywords-list function (diff)
downloadeselect-69150409a534e24107cccc080c5650bbd12bcc8e.tar.gz
eselect-69150409a534e24107cccc080c5650bbd12bcc8e.tar.bz2
eselect-69150409a534e24107cccc080c5650bbd12bcc8e.zip
Allow EPREFIX to be overridden for manipulating prefixed ROOT
* bin/eselect.in: Allow EPREFIX to be overridden for manipulating prefixed ROOT. Signed-off-by: James Le Cuirot <chewi@gentoo.org> Signed-off-by: Ulrich Müller <ulm@gentoo.org>
-rw-r--r--ChangeLog5
-rwxr-xr-xbin/eselect.in7
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6fcf0db..41d4bab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-02-26 James Le Cuirot <chewi@gentoo.org>
+
+ * bin/eselect.in: Allow EPREFIX to be overridden for manipulating
+ prefixed ROOT.
+
2022-05-01 Ulrich Müller <ulm@gentoo.org>
* misc/eselect-mode.el (eselect-mode): For GNU Emacs, use
diff --git a/bin/eselect.in b/bin/eselect.in
index 4caa87e..6a0fdbc 100755
--- a/bin/eselect.in
+++ b/bin/eselect.in
@@ -41,8 +41,11 @@ ESELECT_VERSION="@VERSION@"
ESELECT_BINARY_NAME="$0"
ESELECT_KILL_TARGET="$$"
-# Support variables for Gentoo Prefix
-EPREFIX="@EPREFIX@"
+# Support variables for Gentoo Prefix. BROOT is hardcoded as the
+# prefix for the build host. EPREFIX defaults to the same, but can be
+# overridden at runtime when building for a different prefix.
+BROOT="@EPREFIX@"
+: ${EPREFIX="${BROOT}"}
EROOT="${ROOT%${EPREFIX:+/}}${EPREFIX}"
# Remove all alias definitions. Unset functions and variables that are