X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=bash%2Frc;h=09ceeb801a49854408aedc94e210ba04615a7ce1;hb=9df13622741df2a99bd4067157486098638610b8;hp=9f84fc78f7b3385e016429f9242199a516c5141f;hpb=743a0b65ff1e1c4d1b6701fcdd5e57048f5c47f9;p=config%2Fdotfiles.git

diff --git a/bash/rc b/bash/rc
index 9f84fc7..09ceeb8 100644
--- a/bash/rc
+++ b/bash/rc
@@ -1,29 +1,46 @@
 # Main bash configuration file.
-
-
-# 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
-    source ~/.shell/env
-else
-    function source_config() {
-        echo "Couldn't load source_config(), can't source files." >&2
-    }
+#
+# 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/>.
+
+
+. ~/.shell/functions
+
+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
+    return
 fi
 
-# Load global env file for current hostname (first part before a dot) or
-# global env.local.
-source_config ~/.shell "" env $host
 
 # Set the prompt; hostname and current working directory are displayed.
-PS1="\h:\w \$ "
-
+# Hostname is displayed in bold green, current directory in yellow.
+PS1='\[\033[01;32m\]\h\[\033[00m\]:\[\033[33m\]\w\[\033[00m\] \$ '
 
 # Use Vi(m) style in bash.
 set -o vi
 
 
-# Load rc file for current hostname (first part before a dot) or rc.local.
-source_config ~/.bash "" rc $host
+source_config ~/.shell/aliases
+source_config ~/.shell/rc
+
+source_config ~/.bash/rc.local
+
+# vim: ft=sh