xinb
/
powerlevel10k
mirror of https://github.com/romkatv/powerlevel10k.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix the detection when no containers online

This commit is contained in:
Richard Ziegler 2021-03-08 02:31:44 -05:00
parent b9baf4536d
commit fa929dc372
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/icons.zsh
View File

@ -145,7 +145,7 @@ function _p9k_init_icons() {
JULIA_ICON 'jl' JULIA_ICON 'jl'
SCALA_ICON 'scala' SCALA_ICON 'scala'
DOCKER_ICON '\UE7B0' DOCKER_ICON '\UE7B0'
ONLINE_ICON '\UF111' ONLINE_ICON '\UF674'
PAUSE_ICON '\UF04C' #  PAUSE_ICON '\UF04C' # 
) )
;; ;;
@ -276,7 +276,7 @@ function _p9k_init_icons() {
JULIA_ICON 'jl' JULIA_ICON 'jl'
SCALA_ICON 'scala' SCALA_ICON 'scala'
DOCKER_ICON '\UE7B0' DOCKER_ICON '\UE7B0'
ONLINE_ICON '\UF111' ONLINE_ICON '\UF674'
PAUSE_ICON '\UF04C' #  PAUSE_ICON '\UF04C' # 
) )
;; ;;
@ -410,7 +410,7 @@ function _p9k_init_icons() {
JULIA_ICON 'jl' JULIA_ICON 'jl'
SCALA_ICON 'scala' SCALA_ICON 'scala'
DOCKER_ICON '\UE7B0' DOCKER_ICON '\UE7B0'
ONLINE_ICON '\UF111' ONLINE_ICON '\UF674'
PAUSE_ICON '\UF04C' #  PAUSE_ICON '\UF04C' # 
) )
;; ;;
@ -542,7 +542,7 @@ function _p9k_init_icons() {
JULIA_ICON '\uE624' #  JULIA_ICON '\uE624' # 
SCALA_ICON '\uE737' #  SCALA_ICON '\uE737' # 
DOCKER_ICON '\UE7B0' #  DOCKER_ICON '\UE7B0' # 
ONLINE_ICON '\UF111' #  ONLINE_ICON '\UF674' # 
PAUSE_ICON '\UF04C' #  PAUSE_ICON '\UF04C' # 
) )
;; ;;
@ -802,7 +802,7 @@ function _p9k_init_icons() {
JULIA_ICON 'jl' JULIA_ICON 'jl'
SCALA_ICON 'scala' SCALA_ICON 'scala'
DOCKER_ICON '\UE7B0' DOCKER_ICON '\UE7B0'
ONLINE_ICON '\UF111' ONLINE_ICON '\UF674'
PAUSE_ICON '\UF04C' #  PAUSE_ICON '\UF04C' # 
) )
;; ;;

14
internal/p10k.zsh
View File

@ -1260,7 +1260,7 @@ function prompt_docker() {
local -i len=$#_p9k__prompt _p9k__has_upglob local -i len=$#_p9k__prompt _p9k__has_upglob
# Register the segments. Search for _p9k_left_prompt_segment for argument docs # Register the segments. Search for _p9k_left_prompt_segment for argument docs
_p9k_prompt_segment $0 NONE green DOCKER_ICON 1 '$_p9k__docker_segment' '$_p9k__docker_segment' _p9k_prompt_segment $0 NONE green DOCKER_ICON 1 '$_p9k__docker_up' '$_p9k__docker_segment'
# Copy and paste this line; no changes needed. # Copy and paste this line; no changes needed.
(( _p9k__has_upglob )) || typeset -g "_p9k__segment_val_${_p9k__prompt_side}[_p9k__segment_index]"=$_p9k__prompt[len+1,-1] (( _p9k__has_upglob )) || typeset -g "_p9k__segment_val_${_p9k__prompt_side}[_p9k__segment_index]"=$_p9k__prompt[len+1,-1]
@ -1298,11 +1298,14 @@ function _p9k_prompt_docker_async() {
(( $+commands[docker] )) || return (( $+commands[docker] )) || return
local -A container_status_counts local -A container_status_counts
container_status_counts=(E 0 U 0 P 0) container_status_counts=(E 0 U 0 P 0 S 0)
_p9k__docker_up=
_p9k__docker_segment=
# Minimize all use of subshells and command invocations in general. # Minimize all use of subshells and command invocations in general.
# Async is not a license to be needlessly slow. # Async is not a license to be needlessly slow.
for line in ${(f)"$(command docker ps -a --format '{{ .Status }}' 2>/dev/null)"}; do for line in ${(f)"$( docker ps -a --format 'table {{ .Status }}' 2>/dev/null)"}; do
if [[ "$line" == *(Paused)* ]]; then if [[ "$line" == *(Paused)* ]]; then
(( container_status_counts[P]++ )) (( container_status_counts[P]++ ))
else else
@ -1311,8 +1314,6 @@ function _p9k_prompt_docker_async() {
_p9k__docker_up=1 _p9k__docker_up=1
done done
_p9k__docker_segment=
_p9k_get_icon '' ONLINE_ICON _p9k_get_icon '' ONLINE_ICON
(( ${container_status_counts[U]} )) && \ (( ${container_status_counts[U]} )) && \
_p9k__docker_segment="%F{green}${POWERLEVEL9K_DOCKER_RUNNING_ICON:-$_p9k__ret} ${container_status_counts[U]} %f" _p9k__docker_segment="%F{green}${POWERLEVEL9K_DOCKER_RUNNING_ICON:-$_p9k__ret} ${container_status_counts[U]} %f"
@ -1327,7 +1328,8 @@ function _p9k_prompt_docker_async() {
# All vars that may have changed state must be sent to _p9k_print_params # All vars that may have changed state must be sent to _p9k_print_params
_p9k_print_params \ _p9k_print_params \
_p9k__docker_segment _p9k__docker_segment \
_p9k__docker_up
# The function must end with a reset=value # The function must end with a reset=value
echo -E - 'reset=1' echo -E - 'reset=1'