nojhan/lp-gitcrux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(colors): correct use of arrays

Browse source
This commit is contained in:
Johann Dreo 2023-11-15 11:32:20 +01:00
commit 070672d665
1 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

41
gitcrux.theme
View file

@ -229,65 +229,66 @@ _gitcrux_VCS() {
# - $lp_vcs_stash_count # - $lp_vcs_stash_count
# COLORS # COLORS
local color_lines="$GITCRUX_COLOR_WEAK" local color_lines="${GITCRUX_COLOR_WEAK[@]+"${GITCRUX_COLOR_WEAK[@]}"}"
if (( gitcrux_has_lines_total > GITCRUX_THRESH_LINES_NORMAL )); then if (( gitcrux_has_lines_total > GITCRUX_THRESH_LINES_NORMAL )); then
if (( gitcrux_has_lines_total > GITCRUX_THRESH_LINES_STRONG )); then if (( gitcrux_has_lines_total > GITCRUX_THRESH_LINES_STRONG )); then
color_lines="$GITCRUX_COLOR_STRONG" color_lines="${GITCRUX_COLOR_STRONG[@]+"${GITCRUX_COLOR_STRONG[@]}"}"
else else
color_lines="$GITCRUX_COLOR_NORMAL" color_lines="${GITCRUX_COLOR_NORMAL[@]}"
fi fi
fi fi
local color_behind="$GITCRUX_COLOR_WEAK" local color_behind="${GITCRUX_COLOR_WEAK[@]}"
if (( lp_vcs_commit_behind > GITCRUX_THRESH_BEHIND_NORMAL )); then if (( lp_vcs_commit_behind > GITCRUX_THRESH_BEHIND_NORMAL )); then
if (( lp_vcs_commit_behind > GITCRUX_THRESH_BEHIND_STRONG )); then if (( lp_vcs_commit_behind > GITCRUX_THRESH_BEHIND_STRONG )); then
color_behind="$GITCRUX_COLOR_STRONG" color_behind="${GITCRUX_COLOR_STRONG[@]}"
else else
color_behind="$GITCRUX_COLOR_NORMAL" color_behind="${GITCRUX_COLOR_NORMAL[@]}"
fi fi
fi fi
local color_ahead="$GITCRUX_COLOR_WEAK" local color_ahead="${GITCRUX_COLOR_WEAK[@]}"
if (( lp_vcs_commit_ahead > GITCRUX_THRESH_AHEAD_NORMAL )); then if (( lp_vcs_commit_ahead > GITCRUX_THRESH_AHEAD_NORMAL )); then
if (( lp_vcs_commit_ahead > GITCRUX_THRESH_AHEAD_STRONG )); then if (( lp_vcs_commit_ahead > GITCRUX_THRESH_AHEAD_STRONG )); then
color_ahead="$GITCRUX_COLOR_STRONG" color_ahead="${GITCRUX_COLOR_STRONG[@]}"
else else
color_ahead="$GITCRUX_COLOR_NORMAL" color_ahead="${GITCRUX_COLOR_NORMAL[@]}"
fi fi
fi fi
local color_stash="$GITCRUX_COLOR_WEAK" local color_stash="${GITCRUX_COLOR_WEAK[@]}"
if (( lp_vcs_stash_count > GITCRUX_THRESH_STASH_NORMAL )); then if (( lp_vcs_stash_count > GITCRUX_THRESH_STASH_NORMAL )); then
if (( lp_vcs_stash_count > GITCRUX_THRESH_STASH_STRONG )); then if (( lp_vcs_stash_count > GITCRUX_THRESH_STASH_STRONG )); then
color_stash="$GITCRUX_COLOR_STRONG" color_stash="${GITCRUX_COLOR_STRONG[@]}"
else else
color_stash="$GITCRUX_COLOR_NORMAL" color_stash="${GITCRUX_COLOR_NORMAL[@]}"
fi fi
fi fi
local color_add="$GITCRUX_COLOR_WEAK" local color_add="${GITCRUX_COLOR_WEAK[@]}"
local add_count=$(( gitcrux_has_lines_total + lp_vcs_untracked_files )) local add_count=$(( gitcrux_has_lines_total + lp_vcs_untracked_files ))
if (( add_count > GITCRUX_THRESH_ADD_NORMAL )); then if (( add_count > GITCRUX_THRESH_ADD_NORMAL )); then
if (( add_count > GITCRUX_THRESH_ADD_STRONG )); then if (( add_count > GITCRUX_THRESH_ADD_STRONG )); then
color_add="$GITCRUX_COLOR_STRONG" color_add="${GITCRUX_COLOR_STRONG[@]}"
else else
color_add="$GITCRUX_COLOR_NORMAL" color_add="${GITCRUX_COLOR_NORMAL[@]}"
fi fi
fi fi
# FLOWCHART # FLOWCHART
if [[ "$lp_vcs_type" != "git" ]]; then if [[ "$lp_vcs_type" != "git" ]]; then
_gitcrux_arrow "$_GITCRUX_HEADER_LINE" "${GITCRUX_ARROW_RIGHT[0]}" "${GITCRUX_ARROW_LEFT[1]}" "${GITCRUX_COLOR_MSG}" 1 5 "Unsupported VCS, cannot provide hints" _gitcrux_arrow "$_GITCRUX_HEADER_LINE" "${GITCRUX_ARROW_RIGHT[0]}" "${GITCRUX_ARROW_LEFT[1]}" "${GITCRUX_COLOR_MSG[@]}" 1 5 "Unsupported VCS, cannot provide hints"
GITCRUX_VCS+="${gitcrux_arrow}${n}" GITCRUX_VCS+="${gitcrux_arrow}${n}"
else # VCS is git else # VCS is git
if [[ "$lp_vcs_head_status" ]]; then if [[ "$lp_vcs_head_status" ]]; then
if [[ "$lp_vcs_head_status" == *"REBASE"* ]]; then if [[ "$lp_vcs_head_status" == *"REBASE"* ]]; then
explanation+=" currently rebasing" explanation+=" currently rebasing"
_gitcrux_arrow "$_GITCRUX_HEADER_LINE" ${GITCRUX_ARROW_LEFT[@]} "${GITCRUX_COLOR_NORMAL}" 3 4 "add" _gitcrux_arrow "$_GITCRUX_HEADER_LINE" ${GITCRUX_ARROW_LEFT[@]} "${GITCRUX_COLOR_NORMAL[@]}" 3 4 "add"
GITCRUX_VCS+="${gitcrux_arrow}" GITCRUX_VCS+="${gitcrux_arrow}"
_gitcrux_explain "${explanation}" _gitcrux_explain "${explanation}"
else # Unknown head status. else # Unknown head status.
_gitcrux_arrow "$_GITCRUX_HEADER_LINE" "${GITCRUX_ARROW_RIGHT[0]}" "${GITCRUX_ARROW_LEFT[1]}" "${GITCRUX_COLOR_MSG}" 1 5 "Unsupported head status, cannot provide hints" _gitcrux_arrow "$_GITCRUX_HEADER_LINE" "${GITCRUX_ARROW_RIGHT[0]}" "${GITCRUX_ARROW_LEFT[1]}" "${GITCRUX_COLOR_MSG[@]}" 1 5 "Unsupported head status, cannot provide hints"
GITCRUX_VCS+="${gitcrux_arrow}${n}" GITCRUX_VCS+="${gitcrux_arrow}${n}"
fi fi
else # No specific head status. else # No specific head status.
@ -348,7 +349,7 @@ _gitcrux_VCS() {
explanation+=" and not ahead of the remote" explanation+=" and not ahead of the remote"
if [[ "$head_branch" == *"master"* || "$head_branch" == *"main"* ]]; then if [[ "$head_branch" == *"master"* || "$head_branch" == *"main"* ]]; then
explanation+=", but clean and on main/master" explanation+=", but clean and on main/master"
_gitcrux_arrow "$_GITCRUX_HEADER_LINE" ${GITCRUX_ARROW_RIGHT[@]} "$GITCRUX_COLOR_NORMAL" 2 4 "branch" _gitcrux_arrow "$_GITCRUX_HEADER_LINE" ${GITCRUX_ARROW_RIGHT[@]} "${GITCRUX_COLOR_NORMAL[@]}" 2 4 "branch"
GITCRUX_VCS+="${gitcrux_arrow}" GITCRUX_VCS+="${gitcrux_arrow}"
_gitcrux_explain "${explanation}" _gitcrux_explain "${explanation}"
fi # Main branch. fi # Main branch.
@ -448,7 +449,7 @@ _lp_gitcrux_theme_activate() {
# Light blue. # Light blue.
GITCRUX_COLOR_WEAK=( ${GITCRUX_COLOR_WEAK[@]+"${GITCRUX_COLOR_WEAK[@]}"} ) GITCRUX_COLOR_WEAK=( ${GITCRUX_COLOR_WEAK[@]+"${GITCRUX_COLOR_WEAK[@]}"} )
[[ ${#GITCRUX_COLOR_WEAK[@]} == 0 ]] && GITCRUX_COLOR_WEAK=( 0 195 0 0 14 0 ) [[ ${#GITCRUX_COLOR_WEAK[@]} == 0 ]] && GITCRUX_COLOR_WEAK=( 1 195 0 0 14 0 )
# fg, bg, bold, underline, fallback_fg, fallback_bg # fg, bg, bold, underline, fallback_fg, fallback_bg
# Blue bold. # Blue bold.