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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E493A1382C5 for ; Tue, 8 Jun 2021 07:33:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3A25FE0809; Tue, 8 Jun 2021 07:33:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 221ABE0809 for ; Tue, 8 Jun 2021 07:33:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A1253340A5C for ; Tue, 8 Jun 2021 07:33:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D99F174A for ; Tue, 8 Jun 2021 07:33:11 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1623137482.a24caba8b099b2425307b738a88768abbdc7b724.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/bootstrap-prefix.sh X-VCS-Directories: scripts/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: a24caba8b099b2425307b738a88768abbdc7b724 X-VCS-Branch: master Date: Tue, 8 Jun 2021 07:33:11 +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: 1fa5a5b8-2e6a-415a-b89f-b2edf65ad5b5 X-Archives-Hash: 7de2fe838d9fc59ac5cbe3dbbb0b7450 commit: a24caba8b099b2425307b738a88768abbdc7b724 Author: Fabian Groffen gentoo org> AuthorDate: Tue Jun 8 07:31:22 2021 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue Jun 8 07:31:22 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a24caba8 scripts/bootstrap-prefix: ensure ORIGINAL_PATH is truely original Thanks to suggestion of Alfred Wingate in bug 788334. The value of ORIGINAL_PATH wasn't quite that original. Move setting the var before we tamper with PATH. Closes: https://bugs.gentoo.org/788334 Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index d1108e6eac..97ffa2233d 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -3113,6 +3113,9 @@ case ${CHOST}:${LC_ALL}:${LANG} in ;; esac +# save original path, need this before interactive, #788334 +ORIGINAL_PATH="${PATH}" + # Just guessing a prefix is kind of scary. Hence, to make it a bit less # scary, we force the user to give the prefix location here. This also # makes the script a bit less dangerous as it will die when just run to @@ -3135,7 +3138,6 @@ elif [[ -z $1 ]] ; then fi ROOT="$1" -ORIGINAL_PATH="${PATH}" set_helper_vars case $ROOT in