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 C75E8138334 for ; Mon, 25 Mar 2019 17:17:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B13F5E08F3; Mon, 25 Mar 2019 17:17:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 88B89E08F3 for ; Mon, 25 Mar 2019 17:17:04 +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 C0083335C7A for ; Mon, 25 Mar 2019 17:17:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 60CAE596 for ; Mon, 25 Mar 2019 17:17:00 +0000 (UTC) From: "Michael Haubenwallner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Haubenwallner" Message-ID: <1553534212.032ef433319e81ca59fd4e064059fab3dc11bada.haubi@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: haubi X-VCS-Committer-Name: Michael Haubenwallner X-VCS-Revision: 032ef433319e81ca59fd4e064059fab3dc11bada X-VCS-Branch: master Date: Mon, 25 Mar 2019 17:17:00 +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: fd3f98fb-fa62-44da-bbfc-7fafdae0c3bc X-Archives-Hash: 7feb0b8c4aa29cd198b44d8b28c50a87 commit: 032ef433319e81ca59fd4e064059fab3dc11bada Author: Michael Haubenwallner gentoo org> AuthorDate: Mon Mar 25 17:12:30 2019 +0000 Commit: Michael Haubenwallner gentoo org> CommitDate: Mon Mar 25 17:16:52 2019 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=032ef433 bootstrap-prefix.sh: emerging prefix-toolkit if available Still create /startprefix when app-portage/prefix-toolkit is not available in the tree. Signed-off-by: Michael Haubenwallner gentoo.org> scripts/bootstrap-prefix.sh | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 94040d941d..7d6d808d87 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -607,22 +607,27 @@ bootstrap_startscript() { eerror "automate starting your prefix, set SHELL and rerun this script" > /dev/stderr return 1 fi - 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 "${ROOT}"/usr/portage/scripts - wget $([[ $(wget -h) == *"--no-check-certificate"* ]] && echo --no-check-certificate) \ - https://gitweb.gentoo.org/repo/proj/prefix.git/plain/scripts/startprefix.in \ - -O "${ROOT}"/usr/portage/scripts/startprefix.in - fi + if [[ -d ${ROOT}/usr/portage/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 "${ROOT}"/usr/portage/scripts + wget $([[ $(wget -h) == *"--no-check-certificate"* ]] && echo --no-check-certificate) \ + https://gitweb.gentoo.org/repo/proj/prefix.git/plain/scripts/startprefix.in \ + -O "${ROOT}"/usr/portage/scripts/startprefix.in + fi - sed \ - -e "s|@GENTOO_PORTAGE_EPREFIX@|${ROOT}|g" \ - "${ROOT}"/usr/portage/scripts/startprefix.in \ - > "${ROOT}"/startprefix - chmod 755 "${ROOT}"/startprefix + sed \ + -e "s|@GENTOO_PORTAGE_EPREFIX@|${ROOT}|g" \ + "${ROOT}"/usr/portage/scripts/startprefix.in \ + > "${ROOT}"/startprefix + chmod 755 "${ROOT}"/startprefix + fi einfo "To start Gentoo Prefix, run the script ${ROOT}/startprefix" einfo "You can copy this file to a more convenient place if you like."