X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=sys%2Fbashrc;h=ea8077014500a57e2bd4eecf6c78f43f3f57fc3b;hb=32fbf942911c1aeb131ab777a1212ea7098aef67;hp=5f06233100a012015382e57ec029674fb0f2c8b0;hpb=091b3921138c012f8e7604de77b4a39c894ec19b;p=ConfigScripts.git

diff --git a/sys/bashrc b/sys/bashrc
index 5f06233..ea80770 100644
--- a/sys/bashrc
+++ b/sys/bashrc
@@ -12,14 +12,32 @@ BASHRCREAD="true"
 # Interactive shell?
 [ "$PS1" ] || return
 
-# Shell options
-shopt -s checkwinsize
-shopt -s cdspell
-shopt -s histappend
+# Common command aliases (1/2)
+alias ","="clear && logout"
+alias ".."="cd .."
+alias "ls"="ls -F"
+alias "ll"="ls -l"
+alias "l"="ll -a"
+
+# Shell options (1/2)
 set mark-directories on
 set mark-symlinked-directories on
 HISTCONTROL=ignoredups
 
+# Shell prompt
+PS1="\u@\h:\w \$ "
+
+# Make sure that the following commands are only run with bash >= 3.x
+case "$BASH_VERSION" in
+	"0."*|"1."*) return; ;;
+	*)
+esac
+
+# Shell options (2/2)
+shopt -s checkwinsize
+shopt -s cdspell
+shopt -s histappend
+
 # Shell functions
 sshnew() {
 	ssh -o "StrictHostKeyChecking no" "$@"
@@ -110,12 +128,7 @@ elif [ -x /usr/lib/command-not-found ]; then
 	}
 fi
 
-# Common command aliases
-alias ","="clear && logout"
-alias ".."="cd .."
-alias "ls"="ls -F"
-alias "ll"="ls -l"
-alias "l"="ll -a"
+# Common command aliases (2/2)
 alias "lasth"="last | head -n \`expr \\\$LINES - 2\`"
 
 # Aliases for screen(1), if installed
@@ -129,14 +142,6 @@ fi
 # less(1) filter, if available
 type -p lesspipe >/dev/null 2>&1 && eval `lesspipe`
 
-# Initialize ccache(1), if installed
-if [ -d "/usr/lib/ccache" ]; then
-	PATH="/usr/lib/ccache:$PATH"
-	# Set the cache directory to local storage, if available
-	[ -w "/usr/local/home/$USER" ] \
-		&& export CCACHE_DIR="/usr/local/home/$USER/.ccache"
-fi
-
 # Setup slrn(1) and cleanscore(1), if installed
 type -p cleanscore >/dev/null 2>&1
 [ $? -eq 0 ] && alias slrn="cleanscore -f ~/.slrnscore && slrn"