diff options
| author | romkatv <roman.perepelitsa@gmail.com> | 2020-02-06 18:52:56 +0300 |
|---|---|---|
| committer | romkatv <roman.perepelitsa@gmail.com> | 2020-02-06 18:52:56 +0300 |
| commit | 730ef08dfbbdd0ffc3cf762c5e00fe8f617ed48e (patch) | |
| tree | 9c62b6e3ecc97c50903f5e636f424e140ee73523 | |
| parent | 80139d8949a055af937d07a459a4e755d787cdbc (diff) | |
| parent | d17c7278a5ac8f0273ff8ae6ee9d997bff959891 (diff) | |
Merge branch 'master' into asdf
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | internal/p10k.zsh | 8 |
2 files changed, 6 insertions, 6 deletions
@@ -1087,7 +1087,7 @@ See [cursor is in the wrong place](#cursor-is-in-the-wrong-place). See [cursor is in the wrong place](#cursor-is-in-the-wrong-place). -### Configuration wizard run automatically every time Zsh is started +### Configuration wizard runs automatically every time Zsh is started When Powerlevel10k starts, it automatically runs `p10k configure` if no `POWERLEVEL9K_*` parameters are defined. Based on your prompt style choices, the configuration wizard creates @@ -1427,7 +1427,7 @@ There are a few mitigation options for this issue. - [Cursor is in the wrong place](#cursor-is-in-the-wrong-place) - [Prompt wrapping around in a weird way](#prompt-wrapping-around-in-a-weird-way) - [Right prompt is in the wrong place](#right-prompt-is-in-the-wrong-place) - - [Configuration wizard run automatically every time Zsh is started](#configuration-wizard-run-automatically-every-time-zsh-is-started) + - [Configuration wizard runs automatically every time Zsh is started](#configuration-wizard-runs-automatically-every-time-zsh-is-started) - [Some prompt styles are missing from the configuration wizard](#some-prompt-styles-are-missing-from-the-configuration-wizard) - [Cannot install the recommended font](#cannot-install-the-recommended-font) - [Extra or missing spaces in prompt compared to Powerlevel9k](#extra-or-missing-spaces-in-prompt-compared-to-powerlevel9k) diff --git a/internal/p10k.zsh b/internal/p10k.zsh index f53b0ad3..273096b4 100644 --- a/internal/p10k.zsh +++ b/internal/p10k.zsh @@ -4750,8 +4750,8 @@ function _p9k_prompt_net_iface_async() { # netstat -inbI en0 local iface ip line var typeset -a iface2ip - if [[ -x /sbin/ifconfig ]]; then - for line in ${(f)"$(/sbin/ifconfig 2>/dev/null)"}; do + if (( $+commands[ifconfig] )); then + for line in ${(f)"$(command ifconfig 2>/dev/null)"}; do if [[ $line == (#b)([^[:space:]]##):[[:space:]]##flags=(<->)'<'* ]]; then [[ $match[2] == *[13579] ]] && iface=$match[1] || iface= elif [[ -n $iface && $line == (#b)[[:space:]]##inet[[:space:]]##([0-9.]##)* ]]; then @@ -4759,8 +4759,8 @@ function _p9k_prompt_net_iface_async() { iface= fi done - elif [[ -x /sbin/ip ]]; then - for line in ${(f)"$(/sbin/ip -4 a show 2>/dev/null)"}; do + elif (( $+commands[ip] )); then + for line in ${(f)"$(command ip -4 a show 2>/dev/null)"}; do if [[ $line == (#b)<->:[[:space:]]##([^:]##):[[:space:]]##\<([^\>]#)\>* ]]; then [[ ,$match[2], == *,UP,* ]] && iface=$match[1] || iface= elif [[ -n $iface && $line == (#b)[[:space:]]##inet[[:space:]]##([0-9.]##)* ]]; then |