Merge branch 'fix/example.bashrc' into develop

Fix example.bashrc
liquidprompt · Dec 13, 2014 · fdbd7ca · fdbd7ca
2 parents 76f6813 + ff5edbb
commit fdbd7ca
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/example.bashrc b/example.bashrc
@@ -7,17 +7,19 @@
 
 # Use the system config if it exists
 if [ -f /etc/bashrc ]; then
-    . /etc/bashrc   # --> Read /etc/bashrc, if present.
+    . /etc/bashrc        # --> Read /etc/bashrc, if present.
+elif [ -f /etc/bash.bashrc ]; then
+    . /etc/bash.bashrc   # --> Read /etc/bash.bashrc, if present.
 fi
 
+# The following lines are only for interactive shells
+[[ $- = *i* ]] || return
+
 # Use Bash completion, if installed
 if [ -f /etc/bash_completion ]; then
     . /etc/bash_completion
 fi
 
-# If you have your own config for Liquid Prompt, edit and uncomment this line:
-# source /path/to/liquidpromptrc
-
 # Use Liquid Prompt
-source ~/.liquidprompt
+source ~/liquidprompt/liquidprompt