From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A968E158009 for ; Thu, 29 Jun 2023 08:23:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C7CE3E0802; Thu, 29 Jun 2023 08:22:59 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AD159E0802 for ; Thu, 29 Jun 2023 08:22:59 +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 A7FCB340BE2 for ; Thu, 29 Jun 2023 08:22:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 34E0E135 for ; Thu, 29 Jun 2023 08:22:57 +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: <1688026973.6066bb766f43ca06a5b0f08baa5946ff678f0c29.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/install-qa-check.d/ X-VCS-Repository: proj/portage X-VCS-Files: bin/install-qa-check.d/05prefix X-VCS-Directories: bin/install-qa-check.d/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 6066bb766f43ca06a5b0f08baa5946ff678f0c29 X-VCS-Branch: master Date: Thu, 29 Jun 2023 08:22:57 +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: 44384ae4-2ddd-4804-91a9-ccd19417f07f X-Archives-Hash: 2757fec8587d2dd34cb3e1b8b7450885 commit: 6066bb766f43ca06a5b0f08baa5946ff678f0c29 Author: Benda Xu debian org> AuthorDate: Sun Jun 25 09:03:00 2023 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jun 29 08:22:53 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=6066bb76 bin/install-qa-check.d/05prefix: prefixify init-script shebangs. Init scripts in /etc/init.d have OpenRC shebangs "#!/sbin/openrc-run". They should be prefixified like a executable script in a Prefix. Signed-off-by: Benda Xu gentoo.org> Bug: https://bugs.gentoo.org/640658 Closes: https://github.com/gentoo/portage/pull/1061 Signed-off-by: Sam James gentoo.org> bin/install-qa-check.d/05prefix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/install-qa-check.d/05prefix b/bin/install-qa-check.d/05prefix index 7488ad9e4..28f2c06af 100644 --- a/bin/install-qa-check.d/05prefix +++ b/bin/install-qa-check.d/05prefix @@ -76,8 +76,8 @@ install_qa_check_prefix() { fi continue fi - # unprefixed shebang, is the script directly in ${PATH}? - if [[ ":${PATH}:" == *":${fp}:"* ]] ; then + # unprefixed shebang, is the script directly in ${PATH} or an init script? + if [[ ":${PATH}:${EPREFIX}/etc/init.d:" == *":${fp}:"* ]] ; then if [[ -e ${EROOT}${line[0]} || -e ${ED}${line[0]} ]] ; then # is it unprefixed, but we can just fix it because a # prefixed variant exists