From 0a17052aab9d0b483797f1aae6d325fc8a89bafb Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Fri, 14 Oct 2016 15:00:13 +0200 Subject: [PATCH] Fixed PS1 non-wrapping on long inputs\nAutoload lilo stuff\nRadio script is more verbose --- bash/bash.d/colours | 18 +++++++++--------- bash/rc | 19 +++++++++++-------- bin/radio | 6 +++--- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/bash/bash.d/colours b/bash/bash.d/colours index 8ecd6a0..b1ecf77 100644 --- a/bash/bash.d/colours +++ b/bash/bash.d/colours @@ -5,13 +5,13 @@ ## Can unset with `unset -v {,B,U,I,BI,On_,On_I}{Bla,Red,Gre,Yel,Blu,Pur,Cya,Whi} RCol` RCol='\[\e[0m\]' # Text Reset -# Regular Bold Underline High Intensity BoldHigh Intensity Background High Intensity Backgrounds -Bla='\[\e[0;30m\]'; BBla='\[\e[1;30m\]'; UBla='\[\e[4;30m\]'; IBla='\[\e[0;90m\]'; BIBla='\[\e[1;90m\]'; On_Bla='\e[40m'; On_IBla='\[\e[0;100m\]'; -Red='\[\e[0;31m\]'; BRed='\[\e[1;31m\]'; URed='\[\e[4;31m\]'; IRed='\[\e[0;91m\]'; BIRed='\[\e[1;91m\]'; On_Red='\e[41m'; On_IRed='\[\e[0;101m\]'; -Gre='\[\e[0;32m\]'; BGre='\[\e[1;32m\]'; UGre='\[\e[4;32m\]'; IGre='\[\e[0;92m\]'; BIGre='\[\e[1;92m\]'; On_Gre='\e[42m'; On_IGre='\[\e[0;102m\]'; -Yel='\[\e[0;33m\]'; BYel='\[\e[1;33m\]'; UYel='\[\e[4;33m\]'; IYel='\[\e[0;93m\]'; BIYel='\[\e[1;93m\]'; On_Yel='\e[43m'; On_IYel='\[\e[0;103m\]'; -Blu='\[\e[0;34m\]'; BBlu='\[\e[1;34m\]'; UBlu='\[\e[4;34m\]'; IBlu='\[\e[0;94m\]'; BIBlu='\[\e[1;94m\]'; On_Blu='\e[44m'; On_IBlu='\[\e[0;104m\]'; -Pur='\[\e[0;35m\]'; BPur='\[\e[1;35m\]'; UPur='\[\e[4;35m\]'; IPur='\[\e[0;95m\]'; BIPur='\[\e[1;95m\]'; On_Pur='\e[45m'; On_IPur='\[\e[0;105m\]'; -Cya='\[\e[0;36m\]'; BCya='\[\e[1;36m\]'; UCya='\[\e[4;36m\]'; ICya='\[\e[0;96m\]'; BICya='\[\e[1;96m\]'; On_Cya='\e[46m'; On_ICya='\[\e[0;106m\]'; -Whi='\[\e[0;37m\]'; BWhi='\[\e[1;37m\]'; UWhi='\[\e[4;37m\]'; IWhi='\[\e[0;97m\]'; BIWhi='\[\e[1;97m\]'; On_Whi='\e[47m'; On_IWhi='\[\e[0;107m\]'; +# Regular Bold Underline High Intensity BoldHigh Intensity Background High Intensity Backgrounds +Bla='\[\e[0;30m\]'; BBla='\[\e[1;30m\]'; UBla='\[\e[4;30m\]'; IBla='\[\e[0;90m\]'; BIBla='\[\e[1;90m\]'; On_Bla='\[\e[40m\]'; On_IBla='\[\e[0;100m\]'; +Red='\[\e[0;31m\]'; BRed='\[\e[1;31m\]'; URed='\[\e[4;31m\]'; IRed='\[\e[0;91m\]'; BIRed='\[\e[1;91m\]'; On_Red='\[\e[41m\]'; On_IRed='\[\e[0;101m\]'; +Gre='\[\e[0;32m\]'; BGre='\[\e[1;32m\]'; UGre='\[\e[4;32m\]'; IGre='\[\e[0;92m\]'; BIGre='\[\e[1;92m\]'; On_Gre='\[\e[42m\]'; On_IGre='\[\e[0;102m\]'; +Yel='\[\e[0;33m\]'; BYel='\[\e[1;33m\]'; UYel='\[\e[4;33m\]'; IYel='\[\e[0;93m\]'; BIYel='\[\e[1;93m\]'; On_Yel='\[\e[43m\]'; On_IYel='\[\e[0;103m\]'; +Blu='\[\e[0;34m\]'; BBlu='\[\e[1;34m\]'; UBlu='\[\e[4;34m\]'; IBlu='\[\e[0;94m\]'; BIBlu='\[\e[1;94m\]'; On_Blu='\[\e[44m\]'; On_IBlu='\[\e[0;104m\]'; +Pur='\[\e[0;35m\]'; BPur='\[\e[1;35m\]'; UPur='\[\e[4;35m\]'; IPur='\[\e[0;95m\]'; BIPur='\[\e[1;95m\]'; On_Pur='\[\e[45m\]'; On_IPur='\[\e[0;105m\]'; +Cya='\[\e[0;36m\]'; BCya='\[\e[1;36m\]'; UCya='\[\e[4;36m\]'; ICya='\[\e[0;96m\]'; BICya='\[\e[1;96m\]'; On_Cya='\[\e[46m\]'; On_ICya='\[\e[0;106m\]'; +Whi='\[\e[0;37m\]'; BWhi='\[\e[1;37m\]'; UWhi='\[\e[4;37m\]'; IWhi='\[\e[0;97m\]'; BIWhi='\[\e[1;97m\]'; On_Whi='\[\e[47m\]'; On_IWhi='\[\e[0;107m\]'; ### End Color Vars ### }}} diff --git a/bash/rc b/bash/rc index 36847ea..be30985 100644 --- a/bash/rc +++ b/bash/rc @@ -2,9 +2,15 @@ # see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) # for examples +# Make sure we get system-wide first +if [ -r /etc/bash.bashrc ]; then + source /etc/bash.bashrc +fi + # If not running interactively, don't do anything [ -z "$PS1" ] && return +# Make sure we do have profile sourced, otherwise source it [ -z "$DOTFILES" ] && source ~/.profile ## [ -z "$DOTFILES" ] && echo ".profile missing" && exit 1 @@ -20,22 +26,19 @@ DOTBASH="$DOTFILES/bash" # this, if it's already enabled in /etc/bash.bashrc and /etc/profile # sources /etc/bash.bashrc). if [ -f /etc/bash_completion ] && ! shopt -oq posix; then - . /etc/bash_completion + source /etc/bash_completion fi # Load main things if [ -d "$DOTBASH/bash.d" ]; then - for f in colours aliases history ps1 + for f in colours aliases history 00-marietje ps1 do - source "$DOTBASH/bash.d/$f" + if [ -r "$DOTBASH/bash.d/$f" ]; then + source "$DOTBASH/bash.d/$f" + fi done fi -# Try custom bashrc -#if [[ $HOSTNAME == 'hg'* && -r "hg.bashrc"]]; then -# source "hg.bashrc" -#fi - # Try hostname bashrcs if [ -r "$DOTBASH/$HOSTNAME.bashrc" ]; then source "$DOTBASH/$HOSTNAME.bashrc" diff --git a/bin/radio b/bin/radio index 9299fed..0f2317d 100755 --- a/bin/radio +++ b/bin/radio @@ -57,10 +57,10 @@ done # choose radio if [ -z $RADIO ] then - echo "Radio:" + echo "Which radio?:" select RADIO in $RADIOS do - RADIO=$RADIO + echo "You chose: ${RADIO}" break done fi @@ -84,7 +84,7 @@ then echo "What stream do you want to listen to:" select STREAM in $STREAMS; do - STREAM=$STREAM + echo "You chose: ${STREAM}" break done elif [[ ! $STREAM =~ $STREAMS ]]