projects / packages / setup.git / blame
| Commit | Line | Data |
|---|---|---|
| 457d942b ER |
1 | Index: profile |
| 2 | =================================================================== | |
| 3 | RCS file: /cvsroot/setup/etc/profile,v | |
| 4 | retrieving revision 1.48 | |
| 5 | diff -u -r1.48 profile | |
| 6 | --- ./etc/profile 26 May 2005 18:27:14 -0000 1.48 | |
| 7 | +++ ./etc/profile 30 Apr 2006 11:23:40 -0000 | |
| 8 | @@ -115,19 +115,24 @@ | |
| 9 | # example: | |
| 10 | # cat /etc/env.d/VARIABLE | |
| 11 | # VARIABLE="value" | |
| 12 | -for i in /etc/env.d/* ; do | |
| 13 | - NAME=`basename $i` | |
| 14 | - case $NAME in | |
| 15 | - *~ | *.bak | *.old | *.rpmnew | *.rpmsave ) | |
| 16 | - # nothing | |
| 17 | - ;; | |
| 18 | - * ) | |
| 19 | - if [ -r $i ]; then | |
| 20 | - . $i; export $NAME | |
| 21 | - fi | |
| 22 | - ;; | |
| 23 | - esac | |
| 24 | -done | |
| 25 | +if [ -f /etc/profile.env ]; then | |
| 26 | + . /etc/profile.env | |
| 27 | +else | |
| 28 | + for i in /etc/env.d/* ; do | |
| 29 | + NAME=${i##*/} | |
| 30 | + case $NAME in | |
| 31 | + *~ | *.bak | *.old | *.rpmnew | *.rpmsave ) | |
| 32 | + # nothing | |
| 33 | + ;; | |
| 34 | + * ) | |
| 35 | + if [ -r $i ]; then | |
| 36 | + . $i; export $NAME | |
| 37 | + fi | |
| 38 | + ;; | |
| 39 | + esac | |
| 40 | + done | |
| 41 | + unset NAME | |
| 42 | +fi | |
| 43 | ||
| 44 | # Scripts: | |
| 45 | for i in /etc/profile.d/*.sh ; do |