bash/rc, zsh/rc: Move aliases to shell/aliases.

[config/dotfiles.git] / bash / rc

diff --git a/bash/rc b/bash/rc
index 3e17648afa8fcf10da45358bcb771a7ef7debe77..a1ac587a8f5d0815bfb43d8cb2f1578137c02c44 100644 (file)
--- a/bash/rc
+++ b/bash/rc
@@ -24,6 +24,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,6 +38,11 @@ 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