Merge pull request #353 from marineam/etc-symlinks

fix(app-shells/bash): Update /etc symlinks, use /usr/share/skel
This commit is contained in:
Michael Marineau 2014-02-12 19:01:42 -08:00
commit 36fc328a07
2 changed files with 13 additions and 8 deletions

View File

@ -138,18 +138,23 @@ src_install() {
mv "${D}"/usr/bin/bash "${D}"/bin/ || die mv "${D}"/usr/bin/bash "${D}"/bin/ || die
dosym bash /bin/rbash dosym bash /bin/rbash
insinto /usr/share/bash/defaults/ insinto /usr/share/bash
doins "${FILESDIR}"/{bashrc,bash_logout} for f in bash{_logout,rc} ; do
dosym /usr/share/bash/defaults/bash_logout /etc/bash/bash_logout doins "${FILESDIR}"/${f}
dosym /usr/share/bash/defaults/bashrc /etc/bash/bashrc dosym ../../usr/share/bash/${f} /etc/bash/${f}
insinto /usr/share/bash/skel done
insinto /usr/share/skel
for f in bash{_logout,_profile,rc} ; do for f in bash{_logout,_profile,rc} ; do
newins "${FILESDIR}"/dot-${f} .${f} newins "${FILESDIR}"/dot-${f} .${f}
dosym /usr/share/bash/skel/.${f} /etc/skel/.${f} dosym ../../usr/share/skel/.${f} /etc/skel/.${f}
done done
sed -i -e "s:#${USERLAND}#@::" "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc sed -i -e "s:#${USERLAND}#@::" \
sed -i -e '/#@/d' "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc "${D}"/usr/share/skel/.bashrc \
"${D}"/usr/share/bash/bashrc
sed -i -e '/#@/d' \
"${D}"/usr/share/skel/.bashrc \
"${D}"/usr/share/bash/bashrc
if use plugins ; then if use plugins ; then
exeinto /usr/$(get_libdir)/bash exeinto /usr/$(get_libdir)/bash