From 1fcf5c69c83050c9942fc6f7a5e3f9f74b8b839a Mon Sep 17 00:00:00 2001 From: Alex Polvi Date: Fri, 31 Jan 2014 16:11:34 -0800 Subject: [PATCH] usr(bash): patch bash ebuild to use /usr --- .../app-shells/bash/bash-4.2_p20.ebuild | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-shells/bash/bash-4.2_p20.ebuild b/sdk_container/src/third_party/coreos-overlay/app-shells/bash/bash-4.2_p20.ebuild index f05034f510..93666e71fa 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-shells/bash/bash-4.2_p20.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-shells/bash/bash-4.2_p20.ebuild @@ -134,15 +134,17 @@ src_compile() { src_install() { emake install DESTDIR="${D}" || die - dodir /bin - mv "${D}"/usr/bin/bash "${D}"/bin/ || die - dosym bash /bin/rbash + dodir /usr/bin + dosym bash /usr/bin/rbash - insinto /etc/bash + insinto /usr/share/bash/defaults/ doins "${FILESDIR}"/{bashrc,bash_logout} - insinto /etc/skel + dosym /usr/share/bash/defaults/bash_logout /etc/bash/bash_logout + dosym /usr/share/bash/defaults/bashrc /etc/bash/bashrc + insinto /usr/share/bash/skel for f in bash{_logout,_profile,rc} ; do newins "${FILESDIR}"/dot-${f} .${f} + dosym /usr/share/bash/skel/.${f} /etc/skel/.${f} done sed -i -e "s:#${USERLAND}#@::" "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc