| 1 |
commit: 3d46659bf88caf23cfb631671dbece20bfdf8572 |
| 2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 3 21:58:35 2017 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 3 22:01:40 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/baselayout.git/commit/?id=3d46659b |
| 7 |
|
| 8 |
process files in /etc/profile.d before /etc/bash/bashrc for consistency |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=610898 |
| 11 |
|
| 12 |
etc/profile | 11 ++++++----- |
| 13 |
1 file changed, 6 insertions(+), 5 deletions(-) |
| 14 |
|
| 15 |
diff --git a/etc/profile b/etc/profile |
| 16 |
index 75c1f870..8e92e824 100644 |
| 17 |
--- a/etc/profile |
| 18 |
+++ b/etc/profile |
| 19 |
@@ -28,6 +28,12 @@ fi |
| 20 |
export PATH |
| 21 |
unset ROOTPATH |
| 22 |
|
| 23 |
+# process *.sh files in /etc/profiled.d |
| 24 |
+for sh in /etc/profile.d/*.sh ; do |
| 25 |
+ [ -r "$sh" ] && . "$sh" |
| 26 |
+done |
| 27 |
+unset sh |
| 28 |
+ |
| 29 |
if [ -n "${BASH_VERSION-}" ] ; then |
| 30 |
# Newer bash ebuilds include /etc/bash/bashrc which will setup PS1 |
| 31 |
# including color. We leave out color here because not all |
| 32 |
@@ -50,8 +56,3 @@ else |
| 33 |
# understand sequences such as \h, don't put anything special in it. |
| 34 |
PS1="${USER:-$(whoami 2>/dev/null)}@$(uname -n 2>/dev/null) \$ " |
| 35 |
fi |
| 36 |
- |
| 37 |
-for sh in /etc/profile.d/*.sh ; do |
| 38 |
- [ -r "$sh" ] && . "$sh" |
| 39 |
-done |
| 40 |
-unset sh |
Archives