commit: f7c34a69be5e011fdf10f159c36b91a2c08d3444
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Wed May 13 07:24:30 2020 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> 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 <heroxbd <AT> 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
