#
# Is sourced by all interactive shells and other shells like scp or rcp.
+# Copyright (C) 2011-2012 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/>.
-# 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
-source_debug "sourcing ~/.bash/rc"
+. ~/.shell/functions
+
+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
# 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