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 49ABF1382C5 for ; Wed, 13 May 2020 07:25:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 65F6AE0B5D; Wed, 13 May 2020 07:25:27 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 49123E0B5D for ; Wed, 13 May 2020 07:25:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 A818735027D for ; Wed, 13 May 2020 07:25:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AFB011AC for ; Wed, 13 May 2020 07:25:23 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1589354670.f7c34a69be5e011fdf10f159c36b91a2c08d3444.heroxbd@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: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: f7c34a69be5e011fdf10f159c36b91a2c08d3444 X-VCS-Branch: master Date: Wed, 13 May 2020 07:25:23 +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: d7324461-1f97-4188-9983-b05bfd455b67 X-Archives-Hash: cc5080ed8c0767078a592a71bd7cccef commit: f7c34a69be5e011fdf10f159c36b91a2c08d3444 Author: Benda Xu gentoo org> AuthorDate: Wed May 13 07:24:30 2020 +0000 Commit: Benda XU gentoo org> CommitDate: Wed May 13 07:24:30 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f7c34a69 bootstrap-prefix.sh: remove the startprefix fallback. app-portage/prefix-toolkit is in tree. Signed-off-by: Benda Xu gentoo.org> scripts/bootstrap-prefix.sh | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 19ad9c003a..c50aaa9fd9 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -628,27 +628,8 @@ bootstrap_startscript() { eerror "automate starting your prefix, set SHELL and rerun this script" > /dev/stderr return 1 fi - if [[ -d ${PORTDIR}/app-portage/prefix-toolkit ]] ; then - einfo "Finally, emerging prefix-toolkit for your convenience" - emerge -u app-portage/prefix-toolkit || return 1 - else - einfo "Creating the Prefix start script (startprefix)" - # currently I think right into the prefix is the best location, as - # putting it in /bin or /usr/bin just hides it some more for the - # user - if is-rap ; then - mkdir -p "${PORTDIR}"/scripts - wget $([[ $(wget -h) == *"--no-check-certificate"* ]] && echo --no-check-certificate) \ - https://gitweb.gentoo.org/repo/proj/prefix.git/plain/scripts/startprefix.in \ - -O "${PORTDIR}"/scripts/startprefix.in - fi - - sed \ - -e "s|@GENTOO_PORTAGE_EPREFIX@|${ROOT}|g" \ - "${PORTDIR}"/scripts/startprefix.in \ - > "${ROOT}"/startprefix - chmod 755 "${ROOT}"/startprefix - fi + einfo "Finally, emerging prefix-toolkit for your convenience" + emerge -u app-portage/prefix-toolkit || return 1 einfo "To start Gentoo Prefix, run the script ${ROOT}/startprefix" # see if PATH is kept/respected