aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2007-08-02 18:21:26 -0700
committerDonnie Berkholz <dberkholz@gentoo.org>2007-08-02 18:21:26 -0700
commit0d3ca09e878d408893aec428074620974e8b3e66 (patch)
tree89118025738dae108f7fed03c2f1344ff370f78a /app-shells
parentcoot: pull guile 1.8 patch from upstream instead of our custom one. (diff)
downloaddberkholz-0d3ca09e878d408893aec428074620974e8b3e66.tar.gz
dberkholz-0d3ca09e878d408893aec428074620974e8b3e66.tar.bz2
dberkholz-0d3ca09e878d408893aec428074620974e8b3e66.zip
heirloom-sh: Install to /bin, and don't install /bin/sh unless needed.
Diffstat (limited to 'app-shells')
-rw-r--r--app-shells/heirloom-sh/Manifest8
-rw-r--r--app-shells/heirloom-sh/heirloom-sh-050706.ebuild17
2 files changed, 20 insertions, 5 deletions
diff --git a/app-shells/heirloom-sh/Manifest b/app-shells/heirloom-sh/Manifest
index e218785..08b912d 100644
--- a/app-shells/heirloom-sh/Manifest
+++ b/app-shells/heirloom-sh/Manifest
@@ -1,8 +1,8 @@
DIST heirloom-sh-050706.tar.bz2 82725 RMD160 584458f73e7cd2376b333de2a5fd8a13f364d516 SHA1 0ce709c21e09ef183986347cf1ed80d5884aa12d SHA256 25fb8409e1eb75bb5da21ca32baf2d5eebcb8b84a1288d66e65763a125809e1d
-EBUILD heirloom-sh-050706.ebuild 844 RMD160 e6aeefc3d03fc3492dc7c7a8cebb5099b347406b SHA1 6183e2ce88c3d97f06b759c68e2e595f610d2bc9 SHA256 f39d7fd489a56ed0f6611e1af89e6e44c9d21c0868ab1df28a72be5fbe4f8130
-MD5 312231ed85e590d111594508c4c3eb15 heirloom-sh-050706.ebuild 844
-RMD160 e6aeefc3d03fc3492dc7c7a8cebb5099b347406b heirloom-sh-050706.ebuild 844
-SHA256 f39d7fd489a56ed0f6611e1af89e6e44c9d21c0868ab1df28a72be5fbe4f8130 heirloom-sh-050706.ebuild 844
+EBUILD heirloom-sh-050706.ebuild 1222 RMD160 fa3de231abf133a93af920831d6b25c67801be4f SHA1 8619bdeb5349564c561e655888a404cc7cd93362 SHA256 ec24f05f6d7a5a0e540dad76360c8ff5992707aca858e485ddcb70aee1a37193
+MD5 88c3e331cb0dad3c9539f9c0c3c82f8b heirloom-sh-050706.ebuild 1222
+RMD160 fa3de231abf133a93af920831d6b25c67801be4f heirloom-sh-050706.ebuild 1222
+SHA256 ec24f05f6d7a5a0e540dad76360c8ff5992707aca858e485ddcb70aee1a37193 heirloom-sh-050706.ebuild 1222
MD5 ae468325bc241f388e53ef3be42286a9 files/digest-heirloom-sh-050706 256
RMD160 9cee1f5ba02de613bc2c697ddd07ce18e31f5679 files/digest-heirloom-sh-050706 256
SHA256 402c53825c1244bd6860b6dac3a26c4a7bb7d394c50125cc627644505a31e0ba files/digest-heirloom-sh-050706 256
diff --git a/app-shells/heirloom-sh/heirloom-sh-050706.ebuild b/app-shells/heirloom-sh/heirloom-sh-050706.ebuild
index 4c0615b..f939f13 100644
--- a/app-shells/heirloom-sh/heirloom-sh-050706.ebuild
+++ b/app-shells/heirloom-sh/heirloom-sh-050706.ebuild
@@ -26,13 +26,28 @@ src_compile() {
${myopts} \
|| die "emake failed"
}
+
src_install() {
emake \
- SV3BIN=/usr/bin \
+ SV3BIN=/bin \
MANDIR=/usr/share/man \
UCBINST=/usr/bin/install \
ROOT="${D}" \
install || die "emake install failed"
dodoc CHANGES README || die "dodoc failed"
+
+ mv "${D}"/bin/sh "${D}"/bin/jsh || die "Moving exe to jsh failed"
+}
+
+pkg_preinst() {
+ # If /bin/sh does not exist or is jsh, then provide it
+ # Otherwise leave it alone
+ if [[ ! -e ${ROOT}/bin/sh ]] ; then
+ ln -s jsh "${ROOT}"/bin/sh
+ elif [[ -L ${ROOT}/bin/sh ]] ; then
+ case $(readlink "${ROOT}"/bin/sh) in
+ jsh|/bin/jsh) cp -pPR "${ROOT}"/bin/sh "${D}"/bin/ ;;
+ esac
+ fi
}