From 811a9038698f6fa2311c910432c7224e2de8e36b Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Sun, 2 Oct 2016 23:49:56 +0200 Subject: [PATCH] Moved bash/main into scriptlets. Added to main bashrc --- bash/bashrc | 7 ++++--- bash/main/50-ps | 1 - bash/{main => scriptlets}/aliases | 0 bash/{main => scriptlets}/colours | 0 bash/{main => scriptlets}/history | 0 bash/scriptlets/ps1 | 4 +++- 6 files changed, 7 insertions(+), 5 deletions(-) delete mode 120000 bash/main/50-ps rename bash/{main => scriptlets}/aliases (100%) rename bash/{main => scriptlets}/colours (100%) rename bash/{main => scriptlets}/history (100%) diff --git a/bash/bashrc b/bash/bashrc index 8effa7f..f25f6b2 100644 --- a/bash/bashrc +++ b/bash/bashrc @@ -24,9 +24,10 @@ if [ -f /etc/bash_completion ] && ! shopt -oq posix; then fi # Load main things -if [ -d "$DOTBASH/main" ]; then - for f in $DOTBASH/main/*; do - source "$f" +if [ -d "$DOTBASH/scriptlets" ]; then + for f in colours aliases history ps1 + do + source "$DOTBASH/scriptlets/$f" done fi diff --git a/bash/main/50-ps b/bash/main/50-ps deleted file mode 120000 index 08e51ca..0000000 --- a/bash/main/50-ps +++ /dev/null @@ -1 +0,0 @@ -../scriptlets/50-ps \ No newline at end of file diff --git a/bash/main/aliases b/bash/scriptlets/aliases similarity index 100% rename from bash/main/aliases rename to bash/scriptlets/aliases diff --git a/bash/main/colours b/bash/scriptlets/colours similarity index 100% rename from bash/main/colours rename to bash/scriptlets/colours diff --git a/bash/main/history b/bash/scriptlets/history similarity index 100% rename from bash/main/history rename to bash/scriptlets/history diff --git a/bash/scriptlets/ps1 b/bash/scriptlets/ps1 index 7848816..c8b35e6 100644 --- a/bash/scriptlets/ps1 +++ b/bash/scriptlets/ps1 @@ -67,7 +67,9 @@ function __prompt_command() { PS1+="@" if color ; then - if [[ $HOSTNAME == 'lilo'* ]]; then + if [[ $HOSTNAME == 'fatserf' ]]; then + PS1+="${Pur}\H${RCol}" + elif [[ $HOSTNAME == 'lilo'* ]]; then PS1+="${BWhi}\H${RCol}" elif [[ $HOSTNAME == 'hg'* ]]; then PS1+="${BRed}\H${RCol}"