X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=bash%2Frc;h=3cc4827fbc9a1481d136319a2c586c2fded2fa1f;hb=cfd601470b1697113d311bf6b934bc99488e2e6f;hp=a1ac587a8f5d0815bfb43d8cb2f1578137c02c44;hpb=0b47efd8a633ce89b988f5cd39410b8cfe3c37ae;p=config%2Fdotfiles.git

diff --git a/bash/rc b/bash/rc
index a1ac587..3cc4827 100644
--- a/bash/rc
+++ b/bash/rc
@@ -1,32 +1,18 @@
 # 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/\..*$//')
-
-# Load environmental related settings used by all shells.
-if [ -f ~/.shell/env ]; then
-    . ~/.shell/env
-# Fallback functions as ~/.shell/env couldn't be loaded.
-else
-    function source_debug() {
-        echo $@
-    }
-    function source_config() {
-        echo "Couldn't load source_config(), can't source files." >&2
-    }
-fi
+. ~/.shell/functions
 
-source_debug "sourcing ~/.bash/rc"
+source_debug ". ~/.bash/rc"
 
-# Load global env file for current hostname (first part before a dot) or
-# global env.local.
-source_config ~/.shell "" env $host
+source_config ~/.shell/env
 
 
 # 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
+if [[ $- != *i* ]]; then
     return
 fi
 
@@ -38,15 +24,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
 
+source_config ~/.shell/aliases
 
-# Load rc file for current hostname (first part before a dot) or rc.local.
-source_config ~/.bash host rc $host
+source_config ~/.bash/rc.local
 
-source_debug "finished sourcing ~/.bash/env"
+source_debug ". ~/.bash/rc (done)"
 
 # vim: ft=sh