Don't read /var/lib/$ME/bash.bashrc in non-interactive shells

[ConfigScripts.git] / sys / bashrc

diff --git a/sys/bashrc b/sys/bashrc
index 99cd611b924600609d140e8c63b1300d25837eef..3b9e742a2cdb767d7145da474f01c8b51f18c02a 100644 (file)
--- a/sys/bashrc
+++ b/sys/bashrc
@@ -1,6 +1,6 @@
 #
 # /etc/bash.bashrc: System-wide rc file for interactive bash(1) shells.
-# Written 2003-2009 by Alexander Barton (alex@barton.de)
+# Written 2003-2010 by Alexander Barton (alex@barton.de)
 #
 
 [ -e ~/.ConfigScripts.debug ] && echo " >> /etc/bash.bashrc ..."
@@ -10,10 +10,7 @@ BASHRCREAD="true"
 [ -z "$PROFILEREAD" -a -r /etc/profile ] && source /etc/profile
 
 # Interactive shell?
-if [ ! "$PS1" ]; then
-       [ -r "/var/lib/$ME/bash.bashrc" ] && source /var/lib/$ME/bash.bashrc
-       return
-fi
+[ "$PS1" ] || return
 
 # Shell options
 shopt -s checkwinsize
@@ -32,19 +29,26 @@ sshtmp() {
 }
 
 # Shell prompt
-prefix="${chroot_name:+($chroot_name)}"
 [ "$UID" -eq 0 ] \
-       && PS1="${prefix}\h:\w \\\$ " \
-       || PS1="${prefix}\u@\h:\w \\\$ "
+       && PS1="\h:\w \\\$ " \
+       || PS1="\u@\h:\w \\\$ "
+if [ "\$(type -t __git_ps1)" ]; then
+       PS1="\$(__git_ps1 '(%s) ')$PS1"
+fi
+PS1="${chroot_name:+[$chroot_name] }$PS1"
 
 # Enable bash completion, if available
 [ -z "$BASH_COMPLETION" -a -r /etc/bash_completion ] \
        && source /etc/bash_completion
+[ -z "$BASH_COMPLETION" -a -r /opt/homebrew/etc/bash_completion ] \
+       && source /opt/homebrew/etc/bash_completion
 [ -z "$BASH_COMPLETION" -a -r /opt/local/etc/bash_completion ] \
        && source /opt/local/etc/bash_completion
 
 # If the command-not-found package is installed, use it
-if [ -x /usr/lib/command-not-found ]; then
+if [ -r /etc/bash_command_not_found ]; then
+       . /etc/bash_command_not_found
+elif [ -x /usr/lib/command-not-found ]; then
        function command_not_found_handle {
                # Check because c-n-f could've been removed in the meantime
                if [ -x /usr/lib/command-not-found ]; then