Merge branch 'master' into asdf

pull/479/head
romkatv 5 years ago
commit 730ef08dfb

@ -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). 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_*` When Powerlevel10k starts, it automatically runs `p10k configure` if no `POWERLEVEL9K_*`
parameters are defined. Based on your prompt style choices, the configuration wizard creates 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) - [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) - [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) - [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) - [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) - [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) - [Extra or missing spaces in prompt compared to Powerlevel9k](#extra-or-missing-spaces-in-prompt-compared-to-powerlevel9k)

@ -4750,8 +4750,8 @@ function _p9k_prompt_net_iface_async() {
# netstat -inbI en0 # netstat -inbI en0
local iface ip line var local iface ip line var
typeset -a iface2ip typeset -a iface2ip
if [[ -x /sbin/ifconfig ]]; then if (( $+commands[ifconfig] )); then
for line in ${(f)"$(/sbin/ifconfig 2>/dev/null)"}; do for line in ${(f)"$(command ifconfig 2>/dev/null)"}; do
if [[ $line == (#b)([^[:space:]]##):[[:space:]]##flags=(<->)'<'* ]]; then if [[ $line == (#b)([^[:space:]]##):[[:space:]]##flags=(<->)'<'* ]]; then
[[ $match[2] == *[13579] ]] && iface=$match[1] || iface= [[ $match[2] == *[13579] ]] && iface=$match[1] || iface=
elif [[ -n $iface && $line == (#b)[[:space:]]##inet[[:space:]]##([0-9.]##)* ]]; then elif [[ -n $iface && $line == (#b)[[:space:]]##inet[[:space:]]##([0-9.]##)* ]]; then
@ -4759,8 +4759,8 @@ function _p9k_prompt_net_iface_async() {
iface= iface=
fi fi
done done
elif [[ -x /sbin/ip ]]; then elif (( $+commands[ip] )); then
for line in ${(f)"$(/sbin/ip -4 a show 2>/dev/null)"}; do for line in ${(f)"$(command ip -4 a show 2>/dev/null)"}; do
if [[ $line == (#b)<->:[[:space:]]##([^:]##):[[:space:]]##\<([^\>]#)\>* ]]; then if [[ $line == (#b)<->:[[:space:]]##([^:]##):[[:space:]]##\<([^\>]#)\>* ]]; then
[[ ,$match[2], == *,UP,* ]] && iface=$match[1] || iface= [[ ,$match[2], == *,UP,* ]] && iface=$match[1] || iface=
elif [[ -n $iface && $line == (#b)[[:space:]]##inet[[:space:]]##([0-9.]##)* ]]; then elif [[ -n $iface && $line == (#b)[[:space:]]##inet[[:space:]]##([0-9.]##)* ]]; then

Loading…
Cancel
Save