theme/atomic: lint/cleanup
Use `[[` instead of `[`, set some local variables, still more to cleanpull/2020/head
John D Pell
parent
b846c86dbb
commit
6db5f38f6e
|
|
@ -1,6 +1,5 @@
|
|||
# shellcheck shell=bash
|
||||
# shellcheck disable=SC2034 # Expected behavior for themes.
|
||||
# shellcheck disable=SC2154 #TODO: fix these all.
|
||||
|
||||
# Atomic Bash Prompt for Bash-it
|
||||
# By lfelipe base on the theme brainy of MunifTanjim
|
||||
|
|
@ -29,48 +28,48 @@ Face="\342\230\273"
|
|||
## Parsers ##
|
||||
#############
|
||||
|
||||
____atomic_top_left_parse() {
|
||||
ifs_old="${IFS}"
|
||||
IFS="|"
|
||||
function ____atomic_top_left_parse() {
|
||||
local ifs_old="${IFS}"
|
||||
local IFS="|"
|
||||
read -r -a args <<< "$@"
|
||||
IFS="${ifs_old}"
|
||||
if [ -n "${args[3]}" ]; then
|
||||
_TOP_LEFT+="${args[2]}${args[3]}"
|
||||
if [[ -n "${args[3]:-}" ]]; then
|
||||
_TOP_LEFT+="${args[2]?}${args[3]?}"
|
||||
fi
|
||||
_TOP_LEFT+="${args[0]}${args[1]}"
|
||||
if [ -n "${args[4]}" ]; then
|
||||
_TOP_LEFT+="${args[2]}${args[4]}"
|
||||
_TOP_LEFT+="${args[0]?}${args[1]:-}"
|
||||
if [[ -n "${args[4]:-}" ]]; then
|
||||
_TOP_LEFT+="${args[2]?}${args[4]?}"
|
||||
fi
|
||||
_TOP_LEFT+=""
|
||||
}
|
||||
|
||||
____atomic_top_right_parse() {
|
||||
ifs_old="${IFS}"
|
||||
IFS="|"
|
||||
function ____atomic_top_right_parse() {
|
||||
local ifs_old="${IFS}"
|
||||
local IFS="|"
|
||||
read -r -a args <<< "$@"
|
||||
IFS="${ifs_old}"
|
||||
_TOP_RIGHT+=" "
|
||||
if [ -n "${args[3]}" ]; then
|
||||
_TOP_RIGHT+="${args[2]}${args[3]}"
|
||||
if [[ -n "${args[3]:-}" ]]; then
|
||||
_TOP_RIGHT+="${args[2]?}${args[3]?}"
|
||||
fi
|
||||
_TOP_RIGHT+="${args[0]}${args[1]}"
|
||||
if [ -n "${args[4]}" ]; then
|
||||
_TOP_RIGHT+="${args[2]}${args[4]}"
|
||||
_TOP_RIGHT+="${args[0]?}${args[1]:-}"
|
||||
if [[ -n "${args[4]:-}" ]]; then
|
||||
_TOP_RIGHT+="${args[2]?}${args[4]?}"
|
||||
fi
|
||||
__TOP_RIGHT_LEN=$((__TOP_RIGHT_LEN + ${#args[1]} + ${#args[3]} + ${#args[4]} + 1))
|
||||
((__SEG_AT_RIGHT += 1))
|
||||
}
|
||||
|
||||
____atomic_bottom_parse() {
|
||||
ifs_old="${IFS}"
|
||||
IFS="|"
|
||||
function ____atomic_bottom_parse() {
|
||||
local ifs_old="${IFS}"
|
||||
local IFS="|"
|
||||
read -r -a args <<< "$@"
|
||||
IFS="${ifs_old}"
|
||||
_BOTTOM+="${args[0]}${args[1]}"
|
||||
[ ${#args[1]} -gt 0 ] && _BOTTOM+=" "
|
||||
_BOTTOM+="${args[0]?}${args[1]?${FUNCNAME[0]}}"
|
||||
[[ ${#args[1]} -gt 0 ]] && _BOTTOM+=" "
|
||||
}
|
||||
|
||||
____atomic_top() {
|
||||
function ____atomic_top() {
|
||||
_TOP_LEFT=""
|
||||
_TOP_RIGHT=""
|
||||
__TOP_RIGHT_LEN=0
|
||||
|
|
@ -78,7 +77,7 @@ ____atomic_top() {
|
|||
|
||||
for seg in ${___ATOMIC_TOP_LEFT}; do
|
||||
info="$(___atomic_prompt_"${seg}")"
|
||||
[ -n "${info}" ] && ____atomic_top_left_parse "${info}"
|
||||
[[ -n "${info}" ]] && ____atomic_top_left_parse "${info}"
|
||||
done
|
||||
|
||||
___cursor_right="\e[500C"
|
||||
|
|
@ -86,21 +85,21 @@ ____atomic_top() {
|
|||
|
||||
for seg in ${___ATOMIC_TOP_RIGHT}; do
|
||||
info="$(___atomic_prompt_"${seg}")"
|
||||
[ -n "${info}" ] && ____atomic_top_right_parse "${info}"
|
||||
[[ -n "${info}" ]] && ____atomic_top_right_parse "${info}"
|
||||
done
|
||||
|
||||
[ $__TOP_RIGHT_LEN -gt 0 ] && __TOP_RIGHT_LEN=$((__TOP_RIGHT_LEN - 0))
|
||||
[[ $__TOP_RIGHT_LEN -gt 0 ]] && __TOP_RIGHT_LEN=$((__TOP_RIGHT_LEN - 0))
|
||||
___cursor_adjust="\e[${__TOP_RIGHT_LEN}D"
|
||||
_TOP_LEFT+="${___cursor_adjust}"
|
||||
|
||||
printf "%s%s" "${_TOP_LEFT}" "${_TOP_RIGHT}"
|
||||
}
|
||||
|
||||
____atomic_bottom() {
|
||||
function ____atomic_bottom() {
|
||||
_BOTTOM=""
|
||||
for seg in $___ATOMIC_BOTTOM; do
|
||||
info="$(___atomic_prompt_"${seg}")"
|
||||
[ -n "${info}" ] && ____atomic_bottom_parse "${info}"
|
||||
[[ -n "${info}" ]] && ____atomic_bottom_parse "${info}"
|
||||
done
|
||||
printf "\n%s" "${_BOTTOM}"
|
||||
}
|
||||
|
|
@ -109,95 +108,96 @@ ____atomic_bottom() {
|
|||
## Segments ##
|
||||
##############
|
||||
|
||||
___atomic_prompt_user_info() {
|
||||
color=$white
|
||||
box="${normal}${LineA}\$([[ \$? != 0 ]] && echo \"${BIWhite}[${IRed}${SX}${BIWhite}]${normal}${Line}\")${Line}${BIWhite}[|${BIWhite}]${normal}${Line}"
|
||||
info="${IYellow}\u${IRed}@${IGreen}\h"
|
||||
function ___atomic_prompt_user_info() {
|
||||
local color="${white?}" box
|
||||
local info="${IYellow}\u${IRed}@${IGreen}\h"
|
||||
box="${normal?}${LineA?}\$([[ \$? != 0 ]] && echo \"${BIWhite?}[${IRed?}${SX?}${BIWhite?}]${normal?}${Line?}\")${Line?}${BIWhite?}[|${BIWhite?}]${normal?}${Line?}"
|
||||
|
||||
printf "%s|%s|%s|%s" "${color}" "${info}" "${white}" "${box}"
|
||||
printf "%s|%s|%s|%s" "${color}" "${info}" "${white?}" "${box}"
|
||||
}
|
||||
|
||||
___atomic_prompt_dir() {
|
||||
color=${IRed}
|
||||
box="[|]${normal}"
|
||||
info="\w"
|
||||
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_white}" "${box}"
|
||||
function ___atomic_prompt_dir() {
|
||||
local color="${IRed?}"
|
||||
local box="[|]${normal}"
|
||||
local info="\w"
|
||||
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_white?}" "${box}"
|
||||
}
|
||||
|
||||
___atomic_prompt_scm() {
|
||||
[ "${THEME_SHOW_SCM}" != "true" ] && return
|
||||
color=$bold_green
|
||||
box="${Line}[${IWhite}$(scm_char)] "
|
||||
function ___atomic_prompt_scm() {
|
||||
[[ "${THEME_SHOW_SCM:-}" != "true" ]] && return
|
||||
local color="${bold_green?}" box info
|
||||
box="${Line?}[${IWhite?}$(scm_char)] "
|
||||
info="$(scm_prompt_info)"
|
||||
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_white}" "${box}"
|
||||
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_white?}" "${box}"
|
||||
}
|
||||
|
||||
___atomic_prompt_python() {
|
||||
[ "${THEME_SHOW_PYTHON}" != "true" ] && return
|
||||
color=$bold_yellow
|
||||
box="[|]"
|
||||
function ___atomic_prompt_python() {
|
||||
[[ "${THEME_SHOW_PYTHON:-}" != "true" ]] && return
|
||||
local color="${bold_yellow?}"
|
||||
local box="[|]" info
|
||||
info="$(python_version_prompt)"
|
||||
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_blue}" "${box}"
|
||||
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_blue?}" "${box}"
|
||||
}
|
||||
|
||||
___atomic_prompt_ruby() {
|
||||
[ "${THEME_SHOW_RUBY}" != "true" ] && return
|
||||
color=$bold_white
|
||||
box="[|]"
|
||||
function ___atomic_prompt_ruby() {
|
||||
[[ "${THEME_SHOW_RUBY:-}" != "true" ]] && return
|
||||
local color="${bold_white?}"
|
||||
local box="[|]" info
|
||||
info="rb-$(ruby_version_prompt)"
|
||||
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_red}" "${box}"
|
||||
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_red?}" "${box}"
|
||||
}
|
||||
|
||||
___atomic_prompt_todo() {
|
||||
[ "${THEME_SHOW_TODO}" != "true" ] \
|
||||
|| [ -z "$(which todo.sh)" ] && return
|
||||
color=$bold_white
|
||||
box="[|]"
|
||||
function ___atomic_prompt_todo() {
|
||||
[[ "${THEME_SHOW_TODO:-}" != "true" ||
|
||||
-z "$(which todo.sh)" ]] && return
|
||||
local color="${bold_white?}"
|
||||
local box="[|]" info
|
||||
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}"
|
||||
}
|
||||
|
||||
___atomic_prompt_clock() {
|
||||
[ "${THEME_SHOW_CLOCK}" != "true" ] && return
|
||||
color=$THEME_CLOCK_COLOR
|
||||
box="[|]"
|
||||
function ___atomic_prompt_clock() {
|
||||
[[ "${THEME_SHOW_CLOCK:-}" != "true" ]] && return
|
||||
local color="${THEME_CLOCK_COLOR:-}"
|
||||
local box="[|]" info
|
||||
info="$(date +"${THEME_CLOCK_FORMAT}")"
|
||||
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_white}" "${box}"
|
||||
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_white?}" "${box}"
|
||||
}
|
||||
|
||||
___atomic_prompt_battery() {
|
||||
function ___atomic_prompt_battery() {
|
||||
local batp box info
|
||||
! _command_exists battery_percentage \
|
||||
|| [ "${THEME_SHOW_BATTERY}" != "true" ] \
|
||||
|| [ "$(battery_percentage)" = "no" ] && return
|
||||
|| [[ "${THEME_SHOW_BATTERY:-}" != "true" ]] \
|
||||
|| [[ "$(battery_percentage)" = "no" ]] && return
|
||||
|
||||
batp=$(battery_percentage)
|
||||
if [ "$batp" -eq 50 ] || [ "$batp" -gt 50 ]; then
|
||||
color=$bold_green
|
||||
elif [ "$batp" -lt 50 ] && [ "$batp" -gt 25 ]; then
|
||||
color=$bold_yellow
|
||||
elif [ "$batp" -eq 25 ] || [ "$batp" -lt 25 ]; then
|
||||
color=$IRed
|
||||
if [[ "$batp" -eq 50 || "$batp" -gt 50 ]]; then
|
||||
color="${bold_green?}"
|
||||
elif [[ "$batp" -lt 50 && "$batp" -gt 25 ]]; then
|
||||
color="${bold_yellow?}"
|
||||
elif [[ "$batp" -eq 25 || "$batp" -lt 25 ]]; then
|
||||
color="${IRed?}"
|
||||
fi
|
||||
box="[|]"
|
||||
ac_adapter_connected && info="+"
|
||||
ac_adapter_disconnected && info="-"
|
||||
info+=$batp
|
||||
[ "$batp" -eq 100 ] || [ "$batp" -gt 100 ] && info="AC"
|
||||
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_white}" "${box}"
|
||||
[[ "$batp" -eq 100 || "$batp" -gt 100 ]] && info="AC"
|
||||
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_white?}" "${box}"
|
||||
}
|
||||
|
||||
___atomic_prompt_exitcode() {
|
||||
[ "${THEME_SHOW_EXITCODE}" != "true" ] && return
|
||||
color=$bold_purple
|
||||
[ "$exitcode" -ne 0 ] && printf "%s|%s" "${color}" "${exitcode}"
|
||||
function ___atomic_prompt_exitcode() {
|
||||
[[ "${THEME_SHOW_EXITCODE:-}" != "true" ]] && return
|
||||
local color="${bold_purple?}"
|
||||
[[ "${exitcode?}" -ne 0 ]] && printf "%s|%s" "${color}" "${exitcode}"
|
||||
}
|
||||
|
||||
___atomic_prompt_char() {
|
||||
color=$white
|
||||
prompt_char="${__ATOMIC_PROMPT_CHAR_PS1}"
|
||||
if [ "${THEME_SHOW_SUDO}" == "true" ]; then
|
||||
function ___atomic_prompt_char() {
|
||||
local color="${white?}"
|
||||
local prompt_char="${__ATOMIC_PROMPT_CHAR_PS1?}"
|
||||
if [[ "${THEME_SHOW_SUDO:-}" == "true" ]]; then
|
||||
if sudo -vn 1> /dev/null 2>&1; then
|
||||
prompt_char="${__ATOMIC_PROMPT_CHAR_PS1_SUDO}"
|
||||
prompt_char="${__ATOMIC_PROMPT_CHAR_PS1_SUDO?}"
|
||||
fi
|
||||
fi
|
||||
printf "%s|%s" "${color}" "${prompt_char}"
|
||||
|
|
@ -207,19 +207,17 @@ ___atomic_prompt_char() {
|
|||
## cli ##
|
||||
#########
|
||||
|
||||
__atomic_show() {
|
||||
typeset _seg=${1:-}
|
||||
shift
|
||||
function __atomic_show() {
|
||||
local _seg="${1?}"
|
||||
export "THEME_SHOW_${_seg}"=true
|
||||
}
|
||||
|
||||
__atomic_hide() {
|
||||
typeset _seg=${1:-}
|
||||
shift
|
||||
function __atomic_hide() {
|
||||
local _seg="${1?}"
|
||||
export "THEME_SHOW_${_seg}"=false
|
||||
}
|
||||
|
||||
_atomic_completion() {
|
||||
function _atomic_completion() {
|
||||
local cur _action actions segments
|
||||
COMPREPLY=()
|
||||
cur="${COMP_WORDS[COMP_CWORD]}"
|
||||
|
|
@ -239,22 +237,26 @@ _atomic_completion() {
|
|||
return 0
|
||||
}
|
||||
|
||||
atomic() {
|
||||
typeset action=${1:-}
|
||||
function atomic() {
|
||||
local action="${1?}"
|
||||
shift
|
||||
typeset segs=${*:-}
|
||||
typeset func
|
||||
case $action in
|
||||
local segs=("${@?}")
|
||||
local func
|
||||
case "${action}" in
|
||||
show)
|
||||
func=__atomic_show
|
||||
;;
|
||||
hide)
|
||||
func=__atomic_hide
|
||||
;;
|
||||
*)
|
||||
_log_error "${FUNCNAME[0]}: unknown action '${action}'"
|
||||
return 1
|
||||
;;
|
||||
esac
|
||||
for seg in ${segs}; do
|
||||
seg=$(printf "%s" "${seg}" | tr '[:lower:]' '[:upper:]')
|
||||
$func "${seg}"
|
||||
for seg in "${segs[@]}"; do
|
||||
seg="$(printf "%s" "${seg}" | tr '[:lower:]' '[:upper:]')"
|
||||
"${func}" "${seg}"
|
||||
done
|
||||
}
|
||||
|
||||
|
|
@ -264,55 +266,55 @@ complete -F _atomic_completion atomic
|
|||
## Variables ##
|
||||
###############
|
||||
|
||||
export SCM_THEME_PROMPT_PREFIX=""
|
||||
export SCM_THEME_PROMPT_SUFFIX=""
|
||||
SCM_THEME_PROMPT_PREFIX=""
|
||||
SCM_THEME_PROMPT_SUFFIX=""
|
||||
|
||||
export RBENV_THEME_PROMPT_PREFIX=""
|
||||
export RBENV_THEME_PROMPT_SUFFIX=""
|
||||
export RBFU_THEME_PROMPT_PREFIX=""
|
||||
export RBFU_THEME_PROMPT_SUFFIX=""
|
||||
export RVM_THEME_PROMPT_PREFIX=""
|
||||
export RVM_THEME_PROMPT_SUFFIX=""
|
||||
RBENV_THEME_PROMPT_PREFIX=""
|
||||
RBENV_THEME_PROMPT_SUFFIX=""
|
||||
RBFU_THEME_PROMPT_PREFIX=""
|
||||
RBFU_THEME_PROMPT_SUFFIX=""
|
||||
RVM_THEME_PROMPT_PREFIX=""
|
||||
RVM_THEME_PROMPT_SUFFIX=""
|
||||
|
||||
export SCM_THEME_PROMPT_DIRTY=" ${bold_red}✗${normal}"
|
||||
export SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓${normal}"
|
||||
SCM_THEME_PROMPT_DIRTY=" ${bold_red}✗${normal}"
|
||||
SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓${normal}"
|
||||
|
||||
THEME_SHOW_SUDO=${THEME_SHOW_SUDO:-"true"}
|
||||
THEME_SHOW_SCM=${THEME_SHOW_SCM:-"true"}
|
||||
THEME_SHOW_RUBY=${THEME_SHOW_RUBY:-"false"}
|
||||
THEME_SHOW_PYTHON=${THEME_SHOW_PYTHON:-"false"}
|
||||
THEME_SHOW_CLOCK=${THEME_SHOW_CLOCK:-"true"}
|
||||
THEME_SHOW_TODO=${THEME_SHOW_TODO:-"false"}
|
||||
THEME_SHOW_BATTERY=${THEME_SHOW_BATTERY:-"true"}
|
||||
THEME_SHOW_EXITCODE=${THEME_SHOW_EXITCODE:-"false"}
|
||||
: "${THEME_SHOW_SUDO:="true"}"
|
||||
: "${THEME_SHOW_SCM:="true"}"
|
||||
: "${THEME_SHOW_RUBY:="false"}"
|
||||
: "${THEME_SHOW_PYTHON:="false"}"
|
||||
: "${THEME_SHOW_CLOCK:="true"}"
|
||||
: "${THEME_SHOW_TODO:="false"}"
|
||||
: "${THEME_SHOW_BATTERY:="true"}"
|
||||
: "${THEME_SHOW_EXITCODE:="false"}"
|
||||
|
||||
THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:-"${BICyan}"}
|
||||
THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:-"%a %b %d - %H:%M"}
|
||||
: "${THEME_CLOCK_COLOR:=${BICyan?}}"
|
||||
: "${THEME_CLOCK_FORMAT:="%a %b %d - %H:%M"}"
|
||||
|
||||
__ATOMIC_PROMPT_CHAR_PS1=${THEME_PROMPT_CHAR_PS1:-"${normal}${LineB}${bold_white}${Circle}"}
|
||||
__ATOMIC_PROMPT_CHAR_PS2=${THEME_PROMPT_CHAR_PS2:-"${normal}${LineB}${bold_white}${Circle}"}
|
||||
__ATOMIC_PROMPT_CHAR_PS1=${THEME_PROMPT_CHAR_PS1:-"${normal?}${LineB?}${bold_white?}${Circle?}"}
|
||||
__ATOMIC_PROMPT_CHAR_PS2=${THEME_PROMPT_CHAR_PS2:-"${normal?}${LineB?}${bold_white?}${Circle?}"}
|
||||
|
||||
__ATOMIC_PROMPT_CHAR_PS1_SUDO=${THEME_PROMPT_CHAR_PS1_SUDO:-"${normal}${LineB}${bold_red}${Face}"}
|
||||
__ATOMIC_PROMPT_CHAR_PS2_SUDO=${THEME_PROMPT_CHAR_PS2_SUDO:-"${normal}${LineB}${bold_red}${Face}"}
|
||||
__ATOMIC_PROMPT_CHAR_PS1_SUDO=${THEME_PROMPT_CHAR_PS1_SUDO:-"${normal?}${LineB?}${bold_red?}${Face?}"}
|
||||
__ATOMIC_PROMPT_CHAR_PS2_SUDO=${THEME_PROMPT_CHAR_PS2_SUDO:-"${normal?}${LineB?}${bold_red?}${Face?}"}
|
||||
|
||||
___ATOMIC_TOP_LEFT=${___ATOMIC_TOP_LEFT:-"user_info dir scm"}
|
||||
___ATOMIC_TOP_RIGHT=${___ATOMIC_TOP_RIGHT:-"exitcode python ruby todo clock battery"}
|
||||
___ATOMIC_BOTTOM=${___ATOMIC_BOTTOM:-"char"}
|
||||
: "${___ATOMIC_TOP_LEFT:="user_info dir scm"}"
|
||||
: "${___ATOMIC_TOP_RIGHT:="exitcode python ruby todo clock battery"}"
|
||||
: "${___ATOMIC_BOTTOM:="char"}"
|
||||
|
||||
############
|
||||
## Prompt ##
|
||||
############
|
||||
|
||||
__atomic_ps1() {
|
||||
printf "%s%s%s" "$(____atomic_top)" "$(____atomic_bottom)" "${normal}"
|
||||
function __atomic_ps1() {
|
||||
printf "%s%s%s" "$(____atomic_top)" "$(____atomic_bottom)" "${normal?}"
|
||||
}
|
||||
|
||||
__atomic_ps2() {
|
||||
color=$bold_white
|
||||
printf "%s%s%s" "${color}" "${__ATOMIC_PROMPT_CHAR_PS2} " "${normal}"
|
||||
function __atomic_ps2() {
|
||||
color="${bold_white?}"
|
||||
printf "%s%s%s" "${color}" "${__ATOMIC_PROMPT_CHAR_PS2?} " "${normal?}"
|
||||
}
|
||||
|
||||
_atomic_prompt() {
|
||||
function _atomic_prompt() {
|
||||
exitcode="$?"
|
||||
|
||||
PS1="$(__atomic_ps1)"
|
||||
|
|
|
|||
Loading…
Reference in New Issue