X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=bash%2Frc;h=190cd20f202469a1929282127e5a5e32e27cebcc;hb=999fc26e13aeeda70490451c3a077bd134b34546;hp=942ac8d957b144b9bca9d36c6c2bd7a957bd3004;hpb=c3ccdced26ff5d9baf36858968701e7b12447cd6;p=config%2Fdotfiles.git

diff --git a/bash/rc b/bash/rc
index 942ac8d..190cd20 100644
--- a/bash/rc
+++ b/bash/rc
@@ -1,4 +1,6 @@
 # Main bash configuration file.
+#
+# Is sourced by all interactive shells and other shells like scp or rcp.
 
 
 # Get the current hostname (first part before a dot).
@@ -6,7 +8,7 @@ host=$(echo $(hostname) | sed -e 's/\..*$//')
 
 # Load environmental related settings used by all shells.
 if [ -f ~/.shell/env ]; then
-    source ~/.shell/env
+    . ~/.shell/env
 # Fallback functions as ~/.shell/env couldn't be loaded.
 else
     function source_debug() {
@@ -24,6 +26,13 @@ source_debug "sourcing ~/.bash/rc"
 source_config ~/.shell "" env $host
 
 
+# Check if this is an interactive shell. Abort if not to prevent problems with
+# scp and rcp. Taken from default Debian bashrc. Thanks.
+if [[ $- != *i* ]]; then
+    return
+fi
+
+
 # Set the prompt; hostname and current working directory are displayed.
 # Hostname is displayed in green, current directory in blue.
 PS1='\[\033[01;32m\]\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\] \$ '
@@ -31,8 +40,15 @@ PS1='\[\033[01;32m\]\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\] \$ '
 # Use Vi(m) style in bash.
 set -o vi
 
+# Load aliases and similar functions also used by other shells.
+if [[ -f ~/.shell/aliases ]]; then
+    . ~/.shell/aliases
+fi
+
 
 # Load rc file for current hostname (first part before a dot) or rc.local.
 source_config ~/.bash host rc $host
 
 source_debug "finished sourcing ~/.bash/env"
+
+# vim: ft=sh