commit:     aca04a15a282ceed47c01eceed3e115594fd14fb
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 20 23:37:33 2020 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 14:46:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aca04a15

sys-apps/baselayout: fix quoting and add a missing die call

Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 sys-apps/baselayout/baselayout-2.7.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys-apps/baselayout/baselayout-2.7.ebuild 
b/sys-apps/baselayout/baselayout-2.7.ebuild
index 104cf105212..ee4f298e840 100644
--- a/sys-apps/baselayout/baselayout-2.7.ebuild
+++ b/sys-apps/baselayout/baselayout-2.7.ebuild
@@ -33,7 +33,7 @@ multilib_layout() {
 
        if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
                prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
-               for prefix in ${prefix_lst[@]}; do
+               for prefix in "${prefix_lst[@]}"; do
                        for libdir in ${libdirs}; do
                                dir="${prefix}${libdir}"
                                if [[ -e "${dir}" ]]; then
@@ -153,7 +153,8 @@ multilib_layout() {
        if ! use split-usr ; then
                for libdir in ${libdirs}; do
                        if [[ ! -e "${EROOT}${libdir}" ]]; then
-                               ln -s usr/"${libdir}" "${EROOT}${libdir}"
+                               ln -s usr/"${libdir}" "${EROOT}${libdir}" ||
+                                       die " Unable to make ${EROOT}${libdir} 
symlink"
                        fi
                done
        fi

Reply via email to