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 | 6869fad9373eeb3325854b217b495aafd1d6c941 (patch) | |
| tree | d951a02ccea2b9563bb64d056195d4d23c66f465 /app-shells/bash | |
| parent | Version bump <http://my.opera.com/desktopteam/blog/2008/05/30/polish-stabilit... (diff) | |
| download | historical-6869fad9373eeb3325854b217b495aafd1d6c941.tar.gz historical-6869fad9373eeb3325854b217b495aafd1d6c941.tar.bz2 historical-6869fad9373eeb3325854b217b495aafd1d6c941.zip | |
Make sure /bin/sh always exists #222721 by Davide Pesavento.
Package-Manager: portage-2.2_pre5.spank.spunk
Diffstat (limited to 'app-shells/bash')
| -rw-r--r-- | app-shells/bash/ChangeLog | 5 | ||||
| -rw-r--r-- | app-shells/bash/Manifest | 12 | ||||
| -rw-r--r-- | app-shells/bash/bash-3.2_p39.ebuild | 15 |
3 files changed, 15 insertions, 17 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/Manifest b/app-shells/bash/Manifest index 15df2e59c30c..e9eb21b3034a 100644 --- a/app-shells/bash/Manifest +++ b/app-shells/bash/Manifest @@ -150,13 +150,13 @@ EBUILD bash-3.0-r14.ebuild 4724 RMD160 8c16b1f563c0eb4d2c752141d9575c24c437a398 EBUILD bash-3.1_p17.ebuild 4601 RMD160 7d674942ae8ebcb662faa45a9efacb236bd6202e SHA1 c00fd85917ace93b4d1bdaf6db18224e08260834 SHA256 ff12913c0306b1b597fb7da13740af52c2ccd65125695914fcf84cac455681a8 EBUILD bash-3.2_p17-r1.ebuild 5190 RMD160 9c45f94ce82653ca2d45a322f589ff559c38e6ee SHA1 263691afc042bf469ab864fdf4d78ecfca2ce444 SHA256 339157453d9df410d882e72ea22eac12e62ee176ef013e7570135a3c1b959eab EBUILD bash-3.2_p33.ebuild 5654 RMD160 5501c9711d5fe12b4607de6b44b2d43285039110 SHA1 df96edf15c46796e1d4a92fd63f92c063d47a1a5 SHA256 afd7077d5acee78459d24a1f53554a0731e070bff751f912492392518ab9a3a5 -EBUILD bash-3.2_p39.ebuild 6070 RMD160 1d6af704b959c7a35528f3ca9ba851604e1fc787 SHA1 d09d57f211a964473d1016e33ae2d7553d8a9a3c SHA256 f90b9c2bd659eacbc0b4d3bbcecabccb6f0f3f2c61172a53958b69945909d6b1 -MISC ChangeLog 28621 RMD160 b32ee646cbd64ede79d6275c133cd8a0d443caa9 SHA1 db72cd7a04da85055d9991a0a3250151b218812c SHA256 c68795ab3d6b0cc01975f0977cec517a0467c038e2e3ba9b379cc0b86c255853 +EBUILD bash-3.2_p39.ebuild 5888 RMD160 45a338a5d99c0ea4e8bcbc6e2407e1a2b5fb467f SHA1 374ff9543f0a8082c0c678f0784f0e9fc3ebcb6d SHA256 e649f2ea09698c725806486b85d6a1bc2b8a1e594e26ba075b9f154be74ae19b +MISC ChangeLog 28753 RMD160 4e828e115c19cf72de65010db27032b9b18e56c3 SHA1 9a15c298ed1729fd4937fa983270b57c250da05b SHA256 39ce9cd3bad3e038747d258df66a4642e59a022b68f8830eae488c649d1f1440 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) +Version: GnuPG v2.0.7 (GNU/Linux) -iEYEARECAAYFAkgunzUACgkQXVaO67S1rtsDXQCg+dUDaR+Q2k2MrQqXEMMr9Mhc -dmsAn2e9+I6Pw2f1OT9PTJH5rNvbVmMl -=mQBG +iD8DBQFIQPb2j9hvisErhMIRAtocAJ9A4vv/5L3i95N3NhTjvv1J0j05WwCg57A9 +XwuMDp4rwmN9r4tGy6sb0TI= +=bVAN -----END PGP SIGNATURE----- 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 } |