David Blume commited on 2016-02-29 17:08:18
Showing 2 changed files, with 6 additions and 10 deletions.
... | ... |
@@ -1,15 +1,5 @@ |
1 | 1 |
# ~/.bash_profile: executed by bash for login shells. |
2 | 2 |
|
3 |
-# Source global definitions |
|
4 |
-if [ -f /etc/bashrc ]; then |
|
5 |
- # Macintosh (Darwin) and Fedora / Red Hat |
|
6 |
- . /etc/bashrc |
|
7 |
-elif [ -f /etc/bash.bashrc ]; then |
|
8 |
- # Raspberry Pi / Debian and Cygwin |
|
9 |
- . /etc/bash.bashrc |
|
10 |
-fi |
|
11 |
- |
|
12 |
-# source the user's bashrc if it exists |
|
13 | 3 |
if [ -f "${HOME}/.bashrc" ]; then |
14 | 4 |
source "${HOME}/.bashrc" |
15 | 5 |
fi |
... | ... |
@@ -1,3 +1,9 @@ |
1 |
+if [[ $(uname -s) != Darwin* ]] && [ -f /etc/bashrc ]; then |
|
2 |
+ # Fedora but not Macintosh requires explicit sourcing of /etc/bashrc |
|
3 |
+ # On Debian, it's /etc/bash.bashrc, but it doesn't have to be sourced here. |
|
4 |
+ . /etc/bashrc |
|
5 |
+fi |
|
6 |
+ |
|
1 | 7 |
export PS1="\W\$ " |
2 | 8 |
|
3 | 9 |
add_to_path() { |
4 | 10 |