X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=bash%2Frc;h=6947057ebab18ea3e1f56ded0bef4e91f0b65045;hb=8f24a1138ad378038239e8d0cb9619864f7ca026;hp=7243ceb963138fbb99f7f923e0540a94f11f55dc;hpb=9eb125f460f59b7c1067ae5142fc34393fd99080;p=config%2Fdotfiles.git

diff --git a/bash/rc b/bash/rc
index 7243ceb..6947057 100644
--- a/bash/rc
+++ b/bash/rc
@@ -1,29 +1,26 @@
 # 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
+# Is sourced by all interactive bash shells and other shells like scp or rcp.
+
+# Copyright (C) 2011-2013  Simon Ruderich
+#
+# This file is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this file.  If not, see <http://www.gnu.org/licenses/>.
+
 
-source_debug ". ~/.bash/rc"
+. ~/.shell/functions
 
-# 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
@@ -40,15 +37,10 @@ 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_config ~/.shell/aliases
+source_config ~/.shell/rc
 
-source_debug ". ~/.bash/rc (done)"
+source_config ~/.bash/rc.local
 
 # vim: ft=sh