From 6574efff52ced6f4139d31e5e3fa494e3a31e119 Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Wed, 16 May 2018 15:20:06 -0400 Subject: profiles: amd64/17.1/profile.bashrc - Dereference symlink to /lib and /usr/lib Advanced users may want /lib and/or /usr/lib to point somewhere else This checks what should not be and warns but still lets those advanced people do what they like. --- profiles/default/linux/amd64/17.1/profile.bashrc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'profiles/default/linux/amd64') diff --git a/profiles/default/linux/amd64/17.1/profile.bashrc b/profiles/default/linux/amd64/17.1/profile.bashrc index 44dc51c55408..7019782fb8f9 100644 --- a/profiles/default/linux/amd64/17.1/profile.bashrc +++ b/profiles/default/linux/amd64/17.1/profile.bashrc @@ -1,7 +1,9 @@ -if [[ "${EBUILD_PHASE}" == "setup" ]] && [[ -L ${ROOT%/}/lib || -L ${ROOT%/}/usr/lib ]] ; then - eerror "Please follow the instructions in the news item:" - eerror "2017-12-26-experimental-amd64-17-1-profiles" - eerror "or choose the 17.0 profile." - die "ERROR: 17.1 migration has not been performed!!" +if [[ "${EBUILD_PHASE}" == "setup" ]] ; then + if [[ "$(realpath ${ROOT%/}/lib)" == "${ROOT%/}/lib64" || "$(realpath ${ROOT%/}/usr/lib)" == "${ROOT%/}/usr/lib64" ]] ; then + eerror "Please follow the instructions in the news item:" + eerror "2017-12-26-experimental-amd64-17-1-profiles" + eerror "or choose the 17.0 profile." + die "ERROR: 17.1 migration has not been performed!!" + fi fi -- cgit v1.2.3-65-gdbad