commit: 89b32081e7c8404b35f7d3cf82f105877331454b Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Mon Jun 21 14:20:40 2021 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Mon Jun 21 18:16:14 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89b32081
app-shells/bash: remove /bin/sh logic from pkg_preinst This was added back in 2008 to handle some migration in file ownership. I expect all users have upgraded many times since then. Closes: https://bugs.gentoo.org/778311 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> app-shells/bash/bash-5.0_p18.ebuild | 9 --------- app-shells/bash/bash-5.1_p8.ebuild | 9 --------- 2 files changed, 18 deletions(-) diff --git a/app-shells/bash/bash-5.0_p18.ebuild b/app-shells/bash/bash-5.0_p18.ebuild index 3ea29fe66b1..ab801c88333 100644 --- a/app-shells/bash/bash-5.0_p18.ebuild +++ b/app-shells/bash/bash-5.0_p18.ebuild @@ -255,15 +255,6 @@ pkg_preinst() { mkdir -p "${EROOT}"/etc/bash mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/ fi - - if [[ -L ${EROOT}/bin/sh ]] ; then - # rewrite the symlink to ensure that its mtime changes. having /bin/sh - # missing even temporarily causes a fatal error with paludis. - local target=$(readlink "${EROOT}"/bin/sh) - local tmp="${T}"/sh - ln -sf "${target}" "${tmp}" - mv -f "${tmp}" "${EROOT}"/bin/sh - fi } pkg_postinst() { diff --git a/app-shells/bash/bash-5.1_p8.ebuild b/app-shells/bash/bash-5.1_p8.ebuild index a8f2880bece..88199a177aa 100644 --- a/app-shells/bash/bash-5.1_p8.ebuild +++ b/app-shells/bash/bash-5.1_p8.ebuild @@ -255,15 +255,6 @@ pkg_preinst() { mkdir -p "${EROOT}"/etc/bash mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/ fi - - if [[ -L ${EROOT}/bin/sh ]] ; then - # Rewrite the symlink to ensure that its mtime changes. Having /bin/sh - # missing even temporarily causes a fatal error with paludis. - local target=$(readlink "${EROOT}"/bin/sh) - local tmp="${T}"/sh - ln -sf "${target}" "${tmp}" - mv -f "${tmp}" "${EROOT}"/bin/sh - fi } pkg_postinst() {
