From e455d85b73f79a2d8a94c681d414851f6ca8bc50 Mon Sep 17 00:00:00 2001 From: DarkWiiPlayer Date: Thu, 13 Feb 2020 15:16:34 +0100 Subject: [PATCH] =?UTF-8?q?Make=20jobs=20and=20rangerlevel=20indicators=20?= =?UTF-8?q?less=20annoying=20=F0=9F=92=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bashrc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/bashrc b/bashrc index 90a0186..e057f61 100644 --- a/bashrc +++ b/bashrc @@ -30,36 +30,36 @@ set -o vi rlevel() { if [ -n "$RANGER_LEVEL" ] - then if [ "$RANGER_LEVEL" = 1 ] + then if [ "$RANGER_LEVEL" -gt 1 ] && [ ! -z "$2" ] then - /bin/echo -ne "$1 " + /bin/echo -ne "$1$2$RANGER_LEVEL " else - /bin/echo -ne "$1×$RANGER_LEVEL " + /bin/echo -ne "$1 " fi fi } numjobs() { jobs=$(jobs | wc -l) - if [ $jobs -gt 1 ] - then echo "$1×$jobs " + if [ $jobs -gt 1 ] && [ ! -z "$2" ] + then echo "$1$2$jobs " elif [ $jobs -gt 0 ] then echo "$1 " fi } -export PS1full='\[\033[00;34m\]┌─╼ \[\033[00;37m\]$(numjobs ⚒)\033[00;36m$(rlevel 🥆)\[\033[01;35m\]\u\[\033[00;34m\]@\[\033[01;35m\]\h \[\033[00;33m\]\$ \[\033[01;35m\]\w \[\033[01;34m\]`find -mindepth 1 -maxdepth 1 -type d | wc -l`\[\033[00;34m\]d \[\033[01;32m\]`find -maxdepth 1 -type f | wc -l`\[\033[00;32m\]f\[\033[00;34m\] $(gitprompt) +export PS1full='\[\033[00;34m\]┌─╼ \[\033[00;37m\]$(numjobs ⚒ " ×")\033[00;36m$(rlevel 🥆 ·)\[\033[01;35m\]\u\[\033[00;34m\]@\[\033[01;35m\]\h \[\033[00;33m\]\$ \[\033[01;35m\]\w \[\033[01;34m\]`find -mindepth 1 -maxdepth 1 -type d | wc -l`\[\033[00;34m\]d \[\033[01;32m\]`find -maxdepth 1 -type f | wc -l`\[\033[00;32m\]f\[\033[00;34m\] $(gitprompt) \[\033[00;34m\]└╼ \[\033[00m\]' -export PS1tiny='\[\033[00;37m\]$(numjobs ⚒)\[\033[00;37m\]$(dirs +0 | sed -e "s/.*\\(\\(\\/.*\\)\\{2\\}\\)$/…\\1/") \[\033[00;36m\]$(rlevel 🥆)\[\033[00;34m\]‣ \[\033[00m\]' +export PS1tiny='\[\033[00;37m\]$(numjobs ⚒)\[\033[00;37m\]$(dirs +0 | sed -e "s/.*\\(\\(\\/.*\\)\\{2\\}\\)$/…\\1/") \[\033[00;36m\]$(rlevel 🥆 ·)\[\033[00;34m\]‣ \[\033[00m\]' export PS1nogit='\[\033[00;34m\]┌─╼ \033[00;31m$(rlevel)\[\033[01;35m\]\u\[\033[00;34m\]@\[\033[01;35m\]\h \[\033[00;33m\]\$ \[\033[01;35m\]\w \[\033[01;34m\]`find -mindepth 1 -maxdepth 1 -type d | wc -l`\[\033[00;34m\]d \[\033[01;32m\]`find -maxdepth 1 -type f | wc -l`\[\033[00;32m\]f\[\033[00m\] \[\033[00;34m\]└╼ \[\033[00m\]' -export PS1git='\[\033[00;37m\]$(numjobs ⚒)\[\033[00;37m\]$(gitprompt || dirs +0) \[\033[00;36m\]$(gitpath) \[\033[00;36m\]$(rlevel 🥆) +export PS1git='\[\033[00;37m\]$(numjobs ⚒)\[\033[00;37m\]$(gitprompt || dirs +0) \[\033[00;36m\]$(gitpath) \[\033[00;36m\]$(rlevel 🥆 ·) \[\033[00;34m\]↳ \[\033[00m\]' -export PS1gitlong='\[\033[00;37m\]$(numjobs ⚒)\[\033[00;37m\]$(gitprompt || dirs +0) \[\033[00;37m\]$(git log --oneline --no-decorate -1 2>/dev/null) \[\033[00;36m\]$(rlevel 🥆) +export PS1gitlong='\[\033[00;37m\]$(numjobs ⚒ ·)\[\033[00;37m\]$(gitprompt || dirs +0) \[\033[00;37m\]$(git log --oneline --no-decorate -1 2>/dev/null) \[\033[00;36m\]$(rlevel 🥆 ·) \[\033[00;36m\]$(gitpath)\[\033[00;31m\]» \[\033[00m\]' prompt() {