commit:     296f608638afdf8c98d8c7375db4531f9e08d717
Author:     Kerin Millar <kfm <AT> plushkava <DOT> net>
AuthorDate: Sat Jul 27 21:38:12 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 30 08:14:23 2025 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=296f6086

phase-helpers.sh: quote the expansions of PF

Even if the value of PF is always assumed to be safe, it doesn't hurt to
do it right. Besides which, it stops shellcheck from nagging about it.

Signed-off-by: Kerin Millar <kfm <AT> plushkava.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 bin/phase-helpers.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index 1150fe0bab..3c101a787c 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -19,7 +19,7 @@ export MOPREFIX=${PN}
 # Do not compress files which are smaller than this (in bytes), bug #169260
 export PORTAGE_DOCOMPRESS_SIZE_LIMIT="128"
 declare -a PORTAGE_DOCOMPRESS=( /usr/share/{doc,info,man} )
-declare -a PORTAGE_DOCOMPRESS_SKIP=( /usr/share/doc/${PF}/html )
+declare -a PORTAGE_DOCOMPRESS_SKIP=( "/usr/share/doc/${PF}/html" )
 declare -a PORTAGE_DOSTRIP=( / )
 has strip ${PORTAGE_RESTRICT} && PORTAGE_DOSTRIP=()
 declare -a PORTAGE_DOSTRIP_SKIP=()
@@ -572,11 +572,11 @@ econf() {
 
                        if ___eapi_econf_passes_--docdir_and_--htmldir; then
                                if [[ ${conf_help} == *--docdir* ]]; then
-                                       conf_args+=( 
--docdir="${EPREFIX}"/usr/share/doc/${PF} )
+                                       conf_args+=( 
--docdir="${EPREFIX}/usr/share/doc/${PF}" )
                                fi
 
                                if [[ ${conf_help} == *--htmldir* ]]; then
-                                       conf_args+=( 
--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html )
+                                       conf_args+=( 
--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" )
                                fi
                        fi
 

Reply via email to