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

Merge 52dad2cc8b into a3de748347

Browse source
This commit is contained in:
steelman 2025-01-16 10:45:20 +01:00 • committed by GitHub
commit fd80d5cf77
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
README.md
View file

@ -471,7 +471,12 @@ The color for elements related to a warning.
The color for elements that are not very important. The color for elements that are not very important.
**JOLLY_COLOR_PATH_SHORT** *array<int> = (252 239 0 0 0 15)* **JOLLY_COLOR_HOSTNAME** *array<int> = ( ${JOLLY_COLOR_LITE[@]} )*
The color for the hostname segment. By default initialized from JOLLY_COLOR_LITE.
**JOLLY_COLOR_PATH_SHORT** *array<int> = (252 239 0 0 0 7)*
The color of the shorten path marker. The color of the shorten path marker.

17
jolly.theme
View file

@ -164,6 +164,9 @@ _lp_jolly_theme_activate() {
JOLLY_COLOR_SEP_LITE=( ${JOLLY_COLOR_SEP_LITE[@]+"${JOLLY_COLOR_SEP_LITE[@]}"} ) JOLLY_COLOR_SEP_LITE=( ${JOLLY_COLOR_SEP_LITE[@]+"${JOLLY_COLOR_SEP_LITE[@]}"} )
[[ ${#JOLLY_COLOR_SEP_LITE[@]} == 0 ]] && JOLLY_COLOR_SEP_LITE=( 15 -2 0 0 15 -2) [[ ${#JOLLY_COLOR_SEP_LITE[@]} == 0 ]] && JOLLY_COLOR_SEP_LITE=( 15 -2 0 0 15 -2)
JOLLY_COLOR_HOSTNAME=( ${JOLLY_COLOR_HOSTNAME[@]+"${JOLLY_COLOR_HOSTNAME[@]}"} )
[[ ${#JOLLY_COLOR_HOSTNAME[@]} == 0 ]] && JOLLY_COLOR_HOSTNAME=( ${JOLLY_COLOR_LITE[@]} )
# Default line color for unset variables. # Default line color for unset variables.
LP_COLOR_ENV_VARS_UNSET=${LP_COLOR_ENV_VARS_UNSET:-""} LP_COLOR_ENV_VARS_UNSET=${LP_COLOR_ENV_VARS_UNSET:-""}
# Use the background of notes as a foreground for set variables. # Use the background of notes as a foreground for set variables.
@ -197,7 +200,7 @@ _lp_jolly_theme_activate() {
_lp_jolly_theme_directory() { _lp_jolly_theme_directory() {
lp_terminal_format ${JOLLY_COLOR_LITE[@]+"${JOLLY_COLOR_LITE[@]}"} lp_terminal_format ${JOLLY_COLOR_HOSTNAME[@]+"${JOLLY_COLOR_HOSTNAME[@]}"}
__jolly_directory_FS __jolly_directory_FS
__jolly_directory_path __jolly_directory_path
} }
@ -880,10 +883,10 @@ __jolly_activate_hostname() {
hostname="${JOLLY_HOST_LOCAL}" hostname="${JOLLY_HOST_LOCAL}"
fi fi
if __jolly_make_field "$hostname" ${JOLLY_COLOR_LITE[@]+"${JOLLY_COLOR_LITE[@]}"} ; then if __jolly_make_field "$hostname" ${JOLLY_COLOR_HOSTNAME[@]+"${JOLLY_COLOR_HOSTNAME[@]}"} ; then
_JOLLY_HOSTNAME="${jolly_field}" _JOLLY_HOSTNAME="${jolly_field}"
else else
if __jolly_make_field "$lp_hostname" ${JOLLY_COLOR_LITE[@]+"${JOLLY_COLOR_LITE[@]}"} ; then if __jolly_make_field "$lp_hostname" ${JOLLY_COLOR_HOSTNAME[@]+"${JOLLY_COLOR_HOSTNAME[@]}"} ; then
_JOLLY_HOSTNAME="${jolly_field}" _JOLLY_HOSTNAME="${jolly_field}"
else else
_JOLLY_HOSTNAME="${lp_hostname}" _JOLLY_HOSTNAME="${lp_hostname}"
@ -897,20 +900,20 @@ __jolly_activate_multiplexer() {
if _lp_multiplexer ; then if _lp_multiplexer ; then
case "$lp_multiplexer" in case "$lp_multiplexer" in
tmux) tmux)
__jolly_make_sep_link ${JOLLY_COLOR_LITE[@]+"${JOLLY_COLOR_LITE[@]}"} __jolly_make_sep_link ${JOLLY_COLOR_HOSTNAME[@]+"${JOLLY_COLOR_HOSTNAME[@]}"}
multiplexer="${jolly_sep}" multiplexer="${jolly_sep}"
;; ;;
screen) screen)
__jolly_make_sep_link ${JOLLY_COLOR_LITE[@]+"${JOLLY_COLOR_LITE[@]}"} __jolly_make_sep_link ${JOLLY_COLOR_HOSTNAME[@]+"${JOLLY_COLOR_HOSTNAME[@]}"}
multiplexer="${jolly_sep}" multiplexer="${jolly_sep}"
;; ;;
*) *)
__jolly_make_sep_link ${JOLLY_COLOR_LITE[@]+"${JOLLY_COLOR_LITE[@]}"} __jolly_make_sep_link ${JOLLY_COLOR_HOSTNAME[@]+"${JOLLY_COLOR_HOSTNAME[@]}"}
multiplexer="${jolly_sep}" multiplexer="${jolly_sep}"
;; ;;
esac esac
else else
__jolly_make_sep_plug ${JOLLY_COLOR_LITE[@]+"${JOLLY_COLOR_LITE[@]}"} __jolly_make_sep_plug ${JOLLY_COLOR_HOSTNAME[@]+"${JOLLY_COLOR_HOSTNAME[@]}"}
multiplexer="${jolly_sep}" multiplexer="${jolly_sep}"
fi fi