diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-05-31 06:57:52 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-05-31 06:57:52 +0000 |
| commit | 68e861c422522c0fa8e5aedd9c11b4cb3c709533 (patch) | |
| tree | 46febf78f61df78824f7330368d96084da024edf /app-shells | |
| parent | Version bump <http://my.opera.com/desktopteam/blog/2008/05/30/polish-stabilit... (diff) | |
| download | gentoo-2-68e861c422522c0fa8e5aedd9c11b4cb3c709533.tar.gz gentoo-2-68e861c422522c0fa8e5aedd9c11b4cb3c709533.tar.bz2 gentoo-2-68e861c422522c0fa8e5aedd9c11b4cb3c709533.zip | |
Make sure /bin/sh always exists #222721 by Davide Pesavento.
(Portage version: 2.2_pre5.spank.spunk)
Diffstat (limited to 'app-shells')
| -rw-r--r-- | app-shells/bash/ChangeLog | 5 | ||||
| -rw-r--r-- | app-shells/bash/bash-3.2_p39.ebuild | 15 |
2 files changed, 9 insertions, 11 deletions
diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog index 2ed65c1f7e99..f39ad92363b6 100644 --- a/app-shells/bash/ChangeLog +++ b/app-shells/bash/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-shells/bash # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.177 2008/05/17 09:02:36 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.178 2008/05/31 06:57:52 vapier Exp $ + + 31 May 2008; Mike Frysinger <vapier@gentoo.org> bash-3.2_p39.ebuild: + Make sure /bin/sh always exists #222721 by Davide Pesavento. 17 May 2008; Donnie Berkholz <dberkholz@gentoo.org>; bash-3.2_p39.ebuild: (222211) Install examples with USE=examples. Approved by vapier. diff --git a/app-shells/bash/bash-3.2_p39.ebuild b/app-shells/bash/bash-3.2_p39.ebuild index 2f0fc9835d9a..98756724cf26 100644 --- a/app-shells/bash/bash-3.2_p39.ebuild +++ b/app-shells/bash/bash-3.2_p39.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p39.ebuild,v 1.3 2008/05/17 09:02:36 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p39.ebuild,v 1.4 2008/05/31 06:57:52 vapier Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -182,14 +182,9 @@ pkg_preinst() { if [[ -e ${ROOT}/etc/bash/bash_logout ]] ; then rm -f "${D}"/etc/bash/bash_logout fi +} - # If /bin/sh does not exist or is bash, then provide it - # Otherwise leave it alone - if [[ ! -e ${ROOT}/bin/sh ]] ; then - ln -s bash "${ROOT}"/bin/sh - elif [[ -L ${ROOT}/bin/sh ]] ; then - case $(readlink "${ROOT}"/bin/sh) in - bash|/bin/bash) cp -pPR "${ROOT}"/bin/sh "${D}"/bin/ ;; - esac - fi +pkg_postinst() { + # If /bin/sh does not exist, provide it + [[ ! -e ${ROOT}/bin/sh ]] && ln -sf bash "${ROOT}"/bin/sh } |