Clean brainy

pull/1790/head
BarbUk 2021-01-16 09:13:10 +01:00
parent eadd2685df
commit 662a5c4ac7
No known key found for this signature in database
GPG Key ID: DB301C759539E9FE
1 changed files with 29 additions and 27 deletions

View File

@ -1,4 +1,4 @@
#!/usr/bin/env bash # shellcheck shell=bash
# Brainy Bash Prompt for Bash-it # Brainy Bash Prompt for Bash-it
# by MunifTanjim # by MunifTanjim
@ -10,7 +10,7 @@
____brainy_top_left_parse() { ____brainy_top_left_parse() {
ifs_old="${IFS}" ifs_old="${IFS}"
IFS="|" IFS="|"
args=( $1 ) read -r -a args <<< "$@"
IFS="${ifs_old}" IFS="${ifs_old}"
if [ -n "${args[3]}" ]; then if [ -n "${args[3]}" ]; then
_TOP_LEFT+="${args[2]}${args[3]}" _TOP_LEFT+="${args[2]}${args[3]}"
@ -25,7 +25,7 @@ ____brainy_top_left_parse() {
____brainy_top_right_parse() { ____brainy_top_right_parse() {
ifs_old="${IFS}" ifs_old="${IFS}"
IFS="|" IFS="|"
args=( $1 ) read -r -a args <<< "$@"
IFS="${ifs_old}" IFS="${ifs_old}"
_TOP_RIGHT+=" " _TOP_RIGHT+=" "
if [ -n "${args[3]}" ]; then if [ -n "${args[3]}" ]; then
@ -42,7 +42,7 @@ ____brainy_top_right_parse() {
____brainy_bottom_parse() { ____brainy_bottom_parse() {
ifs_old="${IFS}" ifs_old="${IFS}"
IFS="|" IFS="|"
args=( $1 ) read -r -a args <<< "$@"
IFS="${ifs_old}" IFS="${ifs_old}"
_BOTTOM+="${args[0]}${args[1]}" _BOTTOM+="${args[0]}${args[1]}"
[ ${#args[1]} -gt 0 ] && _BOTTOM+=" " [ ${#args[1]} -gt 0 ] && _BOTTOM+=" "
@ -135,11 +135,11 @@ ___brainy_prompt_ruby() {
} }
___brainy_prompt_todo() { ___brainy_prompt_todo() {
[ "${THEME_SHOW_TODO}" != "true" ] || [ "${THEME_SHOW_TODO}" != "true" ] \
[ -z "$(which todo.sh)" ] && return || [ -z "$(which todo.sh)" ] && return
color=$bold_white color=$bold_white
box="[|]" box="[|]"
info="t:$(todo.sh ls | egrep "TODO: [0-9]+ of ([0-9]+)" | awk '{ print $4 }' )" info="t:$(todo.sh ls | grep -E "TODO: [0-9]+ of ([0-9]+)" | awk '{ print $4 }')"
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_green}" "${box}" printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_green}" "${box}"
} }
@ -152,9 +152,9 @@ ___brainy_prompt_clock() {
} }
___brainy_prompt_battery() { ___brainy_prompt_battery() {
! _command_exists battery_percentage || ! _command_exists battery_percentage \
[ "${THEME_SHOW_BATTERY}" != "true" ] || || [ "${THEME_SHOW_BATTERY}" != "true" ] \
[ "$(battery_percentage)" = "no" ] && return || [ "$(battery_percentage)" = "no" ] && return
info=$(battery_percentage) info=$(battery_percentage)
color=$bold_green color=$bold_green
@ -190,13 +190,13 @@ ___brainy_prompt_char() {
__brainy_show() { __brainy_show() {
typeset _seg=${1:-} typeset _seg=${1:-}
shift shift
export THEME_SHOW_${_seg}=true export "THEME_SHOW_${_seg}"=true
} }
__brainy_hide() { __brainy_hide() {
typeset _seg=${1:-} typeset _seg=${1:-}
shift shift
export THEME_SHOW_${_seg}=false export "THEME_SHOW_${_seg}"=false
} }
_brainy_completion() { _brainy_completion() {
@ -208,16 +208,16 @@ _brainy_completion() {
segments="battery clock exitcode python ruby scm sudo todo" segments="battery clock exitcode python ruby scm sudo todo"
case "${_action}" in case "${_action}" in
show) show)
COMPREPLY=( $(compgen -W "${segments}" -- "${cur}") ) read -r -a COMPREPLY <<< "$(compgen -W "${segments}" -- "${cur}")"
return 0 return 0
;; ;;
hide) hide)
COMPREPLY=( $(compgen -W "${segments}" -- "${cur}") ) read -r -a COMPREPLY <<< "$(compgen -W "${segments}" -- "${cur}")"
return 0 return 0
;; ;;
esac esac
COMPREPLY=( $(compgen -W "${actions}" -- "${cur}") ) read -r -a COMPREPLY <<< "$(compgen -W "${actions}" -- "${cur}")"
return 0 return 0
} }
@ -228,9 +228,11 @@ brainy() {
typeset func typeset func
case $action in case $action in
show) show)
func=__brainy_show;; func=__brainy_show
;;
hide) hide)
func=__brainy_hide;; func=__brainy_hide
;;
esac esac
for seg in ${segs}; do for seg in ${segs}; do
seg=$(printf "%s" "${seg}" | tr '[:lower:]' '[:upper:]') seg=$(printf "%s" "${seg}" | tr '[:lower:]' '[:upper:]')