Simplify configuration setup.

[config/dotfiles.git] / bash / rc

diff --git a/bash/rc b/bash/rc
index 48b6433e26db05e0683514adfe64e6b75a0005a2..3cc4827fbc9a1481d136319a2c586c2fded2fa1f 100644 (file)
--- a/bash/rc
+++ b/bash/rc
@@ -1,21 +1,20 @@
 # 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).
-host=$(echo $(hostname) | sed -e 's/\..*$//')
+. ~/.shell/functions
 
-# Load environmental related settings used by all shells.
-if [ -f ~/.shell/env ]; then
-    source ~/.shell/env
-else
-    function source_config() {
-        echo "Couldn't load source_config(), can't source files." >&2
-    }
-fi
+source_debug ". ~/.bash/rc"
+
+source_config ~/.shell/env
 
-# Load global env file for current hostname (first part before a dot) or
-# global env.local.
-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.
@@ -26,5 +25,10 @@ PS1='\[\033[01;32m\]\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\] \$ '
 set -o vi
 
 
-# Load rc file for current hostname (first part before a dot) or rc.local.
-source_config ~/.bash host rc $host
+source_config ~/.shell/aliases
+
+source_config ~/.bash/rc.local
+
+source_debug ". ~/.bash/rc (done)"
+
+# vim: ft=sh