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

diff --git a/bash/rc b/bash/rc
index e0563a9..6947057 100644
--- a/bash/rc
+++ b/bash/rc
@@ -1,20 +1,46 @@
 # Main bash configuration file.
+#
+# 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/>.
 
-# Use UTF-8 encoding in the terminal.
-export LC_ALL=en_US.UTF-8
 
-# Use Vim as editor.
-export EDITOR='vim'
+. ~/.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
+
+
+# Set the prompt; hostname and current working directory are displayed.
+# Hostname is displayed in green, current directory in blue.
+PS1='\[\033[01;32m\]\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\] \$ '
+
 # Use Vi(m) style in bash.
 set -o vi
 
 
-# If a rc.local file exists load it, otherwise load a rc file for the current
-# hostname (first part before a dot) if it exists.
-host=$(echo $(hostname) | sed -e 's/\..*$//')
-if [ -f ~/.bash/rc.local ]; then
-    source ~/.bash/rc.local
-elif [ -f ~/.bash/rc.$host ]; then
-    source ~/.bash/rc.$host
-fi
+source_config ~/.shell/aliases
+source_config ~/.shell/rc
+
+source_config ~/.bash/rc.local
+
+# vim: ft=sh