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

even more Fixes by the pre-commit checks

pull/1970/head
Ira Abramov 2021-05-19 11:46:21 +03:00
parent 457c106617
commit f0908c875a
5 changed files with 53 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clean_files.txt
View File

@ -111,6 +111,9 @@ themes/command_duration.theme.bash
themes/easy themes/easy
themes/modern themes/modern
themes/powerline themes/powerline
themes/powerline-multiline
themes/powerline-naked
themes/powerline-plain
themes/purity themes/purity
# vendor init files # vendor init files

2
themes/powerline-multiline/powerline-multiline.theme.bash
View File

@ -1,4 +1,4 @@
#!/usr/bin/env bash # shellcheck shell=bash
. "$BASH_IT/themes/powerline-multiline/powerline-multiline.base.bash" . "$BASH_IT/themes/powerline-multiline/powerline-multiline.base.bash"

2
themes/powerline-naked/powerline-naked.theme.bash
View File

@ -1,4 +1,4 @@
#!/usr/bin/env bash # shellcheck shell=bash
. "$BASH_IT/themes/powerline-naked/powerline-naked.base.bash" . "$BASH_IT/themes/powerline-naked/powerline-naked.base.bash"

15
themes/powerline-plain/powerline-plain.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 pad_before_segment=" " local pad_before_segment=" "
@ -17,13 +19,13 @@ function __powerline_left_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_BEFORE_SEPARATOR}" -eq 0 ]]; then if [[ "${POWERLINE_COMPACT_BEFORE_SEPARATOR}" -eq 0 ]]; then
LEFT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR}) ${normal}" LEFT_PROMPT+="$(set_color - "${LAST_SEGMENT_COLOR}") ${normal}"
fi fi
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))
} }
function __powerline_prompt_command { function __powerline_prompt_command {
@ -38,10 +40,11 @@ function __powerline_prompt_command {
## left prompt ## ## left prompt ##
for segment in $POWERLINE_PROMPT; do for segment in $POWERLINE_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
# shellcheck disable=SC2046
[[ "${last_status}" -ne 0 ]] && __powerline_left_segment $(__powerline_last_status_prompt ${last_status}) [[ "${last_status}" -ne 0 ]] && __powerline_left_segment $(__powerline_last_status_prompt ${last_status})
if [[ -n "${LEFT_PROMPT}" ]] && [[ "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT}" -eq 0 ]]; then if [[ -n "${LEFT_PROMPT}" ]] && [[ "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT}" -eq 0 ]]; then

2
themes/powerline-plain/powerline-plain.theme.bash
View File

@ -1,4 +1,4 @@
#!/usr/bin/env bash # shellcheck shell=bash
. "$BASH_IT/themes/powerline-plain/powerline-plain.base.bash" . "$BASH_IT/themes/powerline-plain/powerline-plain.base.bash"