X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=bash%2Frc;h=3cc4827fbc9a1481d136319a2c586c2fded2fa1f;hb=fa98a6e9ebafc93de71cd836a816bdec029bf72f;hp=3874363eea7dacec14f3a0b5cfe030f6ca62b549;hpb=68d93351ef40b729ca285b8de94a6b316e761ad8;p=config%2Fdotfiles.git

diff --git a/bash/rc b/bash/rc
index 3874363..3cc4827 100644
--- a/bash/rc
+++ b/bash/rc
@@ -1,20 +1,34 @@
 # Main bash configuration file.
+#
+# Is sourced by all interactive shells and other shells like scp or rcp.
 
 
-# Use UTF-8 encoding in the terminal.
-export LC_ALL=en_US.UTF-8
+. ~/.shell/functions
+
+source_debug ". ~/.bash/rc"
+
+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 Vim as editor.
-export EDITOR='vim'
 # Use Vi(m) style in bash.
 set -o vi
 
 
-# If a rc file for the current hostname (first part before a dot) exists load
-# it, otherwise load rc.local if available.
-host=$(echo $(hostname) | sed -e 's/\..*$//')
-if [ -f ~/.bash/rc.$host ]; then
-    source ~/.bash/rc.$host
-elif [ -f ~/.bash/rc.local ]; then
-    source ~/.bash/rc.local
-fi
+source_config ~/.shell/aliases
+
+source_config ~/.bash/rc.local
+
+source_debug ". ~/.bash/rc (done)"
+
+# vim: ft=sh