XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes by the pre-commit checks

pull/1970/head
Ira Abramov 2021-05-19 11:26:08 +03:00
parent 9f4c71d40f
commit 457c106617
2 changed files with 107 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
themes/powerline-multiline/powerline-multiline.base.bash
View File

@ -1,12 +1,14 @@
# shellcheck shell=bash
. "$BASH_IT/themes/powerline/powerline.base.bash" . "$BASH_IT/themes/powerline/powerline.base.bash"
function __powerline_last_status_prompt { function __powerline_last_status_prompt {
[[ "$1" -ne 0 ]] && echo "$(set_color ${LAST_STATUS_THEME_PROMPT_COLOR} -) ${1} ${normal}" [[ "$1" -ne 0 ]] && echo "$(set_color "${LAST_STATUS_THEME_PROMPT_COLOR}" -) ${1} ${normal}"
} }
function __powerline_right_segment { function __powerline_right_segment {
local OLD_IFS="${IFS}"; IFS="|" local OLD_IFS="${IFS}"
local params=( $1 ) IFS="|"
local params=("$1")
IFS="${OLD_IFS}" IFS="${OLD_IFS}"
local padding=0 local padding=0
local pad_before_segment=" " local pad_before_segment=" "
@ -15,8 +17,8 @@ function __powerline_right_segment {
if [[ "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT}" -ne 0 ]]; then if [[ "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT}" -ne 0 ]]; then
pad_before_segment="" pad_before_segment=""
fi fi
RIGHT_PROMPT+="$(set_color ${params[1]} -)${POWERLINE_RIGHT_END}${normal}" RIGHT_PROMPT+="$(set_color "${params[1]}" -)${POWERLINE_RIGHT_END}${normal}"
(( padding += 1 )) ((padding += 1))
else else
if [[ "${POWERLINE_COMPACT_BEFORE_SEPARATOR}" -ne 0 ]]; then if [[ "${POWERLINE_COMPACT_BEFORE_SEPARATOR}" -ne 0 ]]; then
pad_before_segment="" pad_before_segment=""
@ -24,30 +26,30 @@ function __powerline_right_segment {
# Since the previous segment wasn't the last segment, add padding, if needed # Since the previous segment wasn't the last segment, add padding, if needed
# #
if [[ "${POWERLINE_COMPACT_AFTER_SEPARATOR}" -eq 0 ]]; then if [[ "${POWERLINE_COMPACT_AFTER_SEPARATOR}" -eq 0 ]]; then
RIGHT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR}) ${normal}" RIGHT_PROMPT+="$(set_color - "${LAST_SEGMENT_COLOR}") ${normal}"
(( padding += 1 )) ((padding += 1))
fi fi
if [[ "${LAST_SEGMENT_COLOR}" -eq "${params[1]}" ]]; then if [[ "${LAST_SEGMENT_COLOR}" -eq "${params[1]}" ]]; then
RIGHT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR})${POWERLINE_RIGHT_SEPARATOR_SOFT}${normal}" RIGHT_PROMPT+="$(set_color - "${LAST_SEGMENT_COLOR}")${POWERLINE_RIGHT_SEPARATOR_SOFT}${normal}"
else else
RIGHT_PROMPT+="$(set_color ${params[1]} ${LAST_SEGMENT_COLOR})${POWERLINE_RIGHT_SEPARATOR}${normal}" RIGHT_PROMPT+="$(set_color "${params[1]}" "${LAST_SEGMENT_COLOR}")${POWERLINE_RIGHT_SEPARATOR}${normal}"
fi fi
(( padding += 1 )) ((padding += 1))
fi fi
RIGHT_PROMPT+="$(set_color - ${params[1]})${pad_before_segment}${params[0]}${normal}" RIGHT_PROMPT+="$(set_color - "${params[1]}")${pad_before_segment}${params[0]}${normal}"
(( padding += ${#pad_before_segment} )) ((padding += ${#pad_before_segment}))
(( padding += ${#params[0]} )) ((padding += ${#params[0]}))
(( RIGHT_PROMPT_LENGTH += padding )) ((RIGHT_PROMPT_LENGTH += padding))
LAST_SEGMENT_COLOR="${params[1]}" LAST_SEGMENT_COLOR="${params[1]}"
(( SEGMENTS_AT_RIGHT += 1 )) ((SEGMENTS_AT_RIGHT += 1))
} }
function __powerline_right_first_segment_padding { function __powerline_right_first_segment_padding {
RIGHT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR}) ${normal}" RIGHT_PROMPT+="$(set_color - "${LAST_SEGMENT_COLOR}") ${normal}"
(( RIGHT_PROMPT_LENGTH += 1 )) ((RIGHT_PROMPT_LENGTH += 1))
} }
function __powerline_prompt_command { function __powerline_prompt_command {
@ -64,7 +66,7 @@ function __powerline_prompt_command {
## left prompt ## ## left prompt ##
for segment in $POWERLINE_LEFT_PROMPT; do for segment in $POWERLINE_LEFT_PROMPT; do
local info="$(__powerline_${segment}_prompt)" local info="$(__powerline_"${segment}"_prompt)"
[[ -n "${info}" ]] && __powerline_left_segment "${info}" [[ -n "${info}" ]] && __powerline_left_segment "${info}"
done done
@ -72,13 +74,13 @@ function __powerline_prompt_command {
__powerline_left_last_segment_padding __powerline_left_last_segment_padding
fi fi
[[ -n "${LEFT_PROMPT}" ]] && LEFT_PROMPT+="$(set_color ${LAST_SEGMENT_COLOR} -)${POWERLINE_LEFT_END}${normal}" [[ -n "${LEFT_PROMPT}" ]] && LEFT_PROMPT+="$(set_color "${LAST_SEGMENT_COLOR}" -)${POWERLINE_LEFT_END}${normal}"
## right prompt ## ## right prompt ##
if [[ -n "${POWERLINE_RIGHT_PROMPT}" ]]; then if [[ -n "${POWERLINE_RIGHT_PROMPT}" ]]; then
# LEFT_PROMPT+="${move_cursor_rightmost}" # LEFT_PROMPT+="${move_cursor_rightmost}"
for segment in $POWERLINE_RIGHT_PROMPT; do for segment in $POWERLINE_RIGHT_PROMPT; do
local info="$(__powerline_${segment}_prompt)" local info="$(__powerline_"${segment}"_prompt)"
[[ -n "${info}" ]] && __powerline_right_segment "${info}" [[ -n "${info}" ]] && __powerline_right_segment "${info}"
done done
@ -86,9 +88,9 @@ function __powerline_prompt_command {
__powerline_right_first_segment_padding __powerline_right_first_segment_padding
fi fi
RIGHT_PAD=$(printf "%.s " $(seq 1 $RIGHT_PROMPT_LENGTH)) RIGHT_PAD=$(printf "%.s " $(seq 1 "$RIGHT_PROMPT_LENGTH"))
LEFT_PROMPT+="${RIGHT_PAD}${move_cursor_rightmost}" LEFT_PROMPT+="${RIGHT_PAD}${move_cursor_rightmost}"
LEFT_PROMPT+="\033[$(( ${#RIGHT_PAD} - 1 ))D" LEFT_PROMPT+="\033[$((${#RIGHT_PAD} - 1))D"
fi fi
local prompt="${PROMPT_CHAR}" local prompt="${PROMPT_CHAR}"

12
themes/powerline-naked/powerline-naked.base.bash
View File

@ -1,8 +1,10 @@
# shellcheck shell=bash
. "$BASH_IT/themes/powerline/powerline.base.bash" . "$BASH_IT/themes/powerline/powerline.base.bash"
function __powerline_left_segment { function __powerline_left_segment {
local OLD_IFS="${IFS}"; IFS="|" local OLD_IFS="${IFS}"
local params=( $1 ) IFS="|"
local params=("$1")
IFS="${OLD_IFS}" IFS="${OLD_IFS}"
local separator="" local separator=""
local pad_before_segment=" " local pad_before_segment=" "
@ -23,12 +25,12 @@ function __powerline_left_segment {
LEFT_PROMPT+="${POWERLINE_LEFT_SEPARATOR}" LEFT_PROMPT+="${POWERLINE_LEFT_SEPARATOR}"
fi fi
LEFT_PROMPT+="$(set_color ${params[1]} -)${pad_before_segment}${params[0]}${normal}" LEFT_PROMPT+="$(set_color "${params[1]}" -)${pad_before_segment}${params[0]}${normal}"
LAST_SEGMENT_COLOR=${params[1]} LAST_SEGMENT_COLOR=${params[1]}
(( SEGMENTS_AT_LEFT += 1 )) ((SEGMENTS_AT_LEFT += 1))
_save-and-reload-history "${HISTORY_AUTOSAVE:-0}" _save-and-reload-history "${HISTORY_AUTOSAVE:-0}"
} }
function __powerline_left_last_segment_padding { function __powerline_left_last_segment_padding {
LEFT_PROMPT+="$(set_color ${LAST_SEGMENT_COLOR} -) ${normal}" LEFT_PROMPT+="$(set_color "${LAST_SEGMENT_COLOR}" -) ${normal}"
} }