From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A7E2E1580EB for ; Fri, 30 May 2025 08:14:58 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 92C773430DD for ; Fri, 30 May 2025 08:14:58 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id E864C1104B9; Fri, 30 May 2025 08:14:36 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id D7FB81104B9 for ; Fri, 30 May 2025 08:14:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 91BB8343099 for ; Fri, 30 May 2025 08:14:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 598CD28FD for ; Fri, 30 May 2025 08:14:34 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1748592863.296f608638afdf8c98d8c7375db4531f9e08d717.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/phase-helpers.sh X-VCS-Directories: bin/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 296f608638afdf8c98d8c7375db4531f9e08d717 X-VCS-Branch: master Date: Fri, 30 May 2025 08:14:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6216d67d-416c-41a7-9b8d-9643ca5a72a9 X-Archives-Hash: 40071b35b1dc3373577e191ab69cdb78 commit: 296f608638afdf8c98d8c7375db4531f9e08d717 Author: Kerin Millar plushkava net> AuthorDate: Sat Jul 27 21:38:12 2024 +0000 Commit: Sam James gentoo 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 plushkava.net> Signed-off-by: Sam James 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