[patch] bashrc.d patch

0001-add-bashrc.d-support.patch (text/plain), 1.69 KB, created by Michał Górny on 2014-11-09 12:23:23 UTC

From 199c017da555c2d57507fecffcaa9b4601eb71dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[e-mail]>
Date: Sun, 9 Nov 2014 13:09:18 +0100
Subject: [PATCH] add bashrc.d support

---
 app-shells/bash/{bash-4.3_p30.ebuild => bash-4.3_p30-r1.ebuild} | 4 +++-
 app-shells/bash/files/{bashrc => bashrc-r1}                     | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)
 copy app-shells/bash/{bash-4.3_p30.ebuild => bash-4.3_p30-r1.ebuild} (98%)
 copy app-shells/bash/files/{bashrc => bashrc-r1} (96%)

diff --git a/app-shells/bash/bash-4.3_p30.ebuild b/app-shells/bash/bash-4.3_p30-r1.ebuild
similarity index 98%
copy from app-shells/bash/bash-4.3_p30.ebuild
copy to app-shells/bash/bash-4.3_p30-r1.ebuild
index e0e41d0..34fed11 100644
--- a/app-shells/bash/bash-4.3_p30.ebuild
+++ b/app-shells/bash/bash-4.3_p30-r1.ebuild
@@ -175,7 +175,9 @@ src_install() {
 	dosym bash /bin/rbash
 
 	insinto /etc/bash
-	doins "${FILESDIR}"/{bashrc,bash_logout}
+	doins "${FILESDIR}"/bash_logout
+	newins "${FILESDIR}"/bashrc-r1 bashrc
+	keepdir /etc/bash/bashrc.d
 	insinto /etc/skel
 	for f in bash{_logout,_profile,rc} ; do
 		newins "${FILESDIR}"/dot-${f} .${f}
diff --git a/app-shells/bash/files/bashrc b/app-shells/bash/files/bashrc-r1
similarity index 96%
copy from app-shells/bash/files/bashrc
copy to app-shells/bash/files/bashrc-r1
index a398eb1..c6e9509 100644
--- a/app-shells/bash/files/bashrc
+++ b/app-shells/bash/files/bashrc-r1
@@ -84,5 +84,9 @@ else
 	fi
 fi
 
+for sh in /etc/bash/bashrc.d/* ; do
+	[[ -r ${sh} ]] && source "${sh}"
+done
+
 # Try to keep environment pollution down, EPA loves us.
-unset use_color safe_term match_lhs
+unset use_color safe_term match_lhs sh
-- 
2.1.3