fix(vagrant-prompt): make vagrant_prompt_info generic for any state (#12782)

This commit is contained in:
Marc Cornellà 2024-10-27 17:31:38 +01:00 committed by GitHub
parent 68d189cb35
commit fa64758aea
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 37 additions and 16 deletions

View file

@ -17,11 +17,15 @@ To display Vagrant info on your prompt add the `vagrant_prompt_info` to the
`$PROMPT` or `$RPROMPT` variable in your theme. Example: `$PROMPT` or `$RPROMPT` variable in your theme. Example:
```zsh ```zsh
PROMPT='%{$fg[$NCOLOR]%}%B%n%b%{$reset_color%}:%{$fg[blue]%}%B%c/%b%{$reset_color%} $(vagrant_prompt_info)$(svn_prompt_info)$(git_prompt_info)%(!.#.$) ' PROMPT="$PROMPT"' $(vagrant_prompt_info)'
# or
RPROMPT='$(vagrant_prompt_info)'
``` ```
`vagrant_prompt_info` makes use of some custom variables. This is an example ### Customization
definition:
`vagrant_prompt_info` makes use of the following custom variables, which can be set in your
`.zshrc` file:
```zsh ```zsh
ZSH_THEME_VAGRANT_PROMPT_PREFIX="%{$fg_bold[blue]%}[" ZSH_THEME_VAGRANT_PROMPT_PREFIX="%{$fg_bold[blue]%}["
@ -31,3 +35,18 @@ ZSH_THEME_VAGRANT_PROMPT_POWEROFF="%{$fg_no_bold[red]%}●"
ZSH_THEME_VAGRANT_PROMPT_SUSPENDED="%{$fg_no_bold[yellow]%}●" ZSH_THEME_VAGRANT_PROMPT_SUSPENDED="%{$fg_no_bold[yellow]%}●"
ZSH_THEME_VAGRANT_PROMPT_NOT_CREATED="%{$fg_no_bold[white]%}○" ZSH_THEME_VAGRANT_PROMPT_NOT_CREATED="%{$fg_no_bold[white]%}○"
``` ```
### State to variable mapping
The plugin uses the output reported by `vagrant status` to print whichever symbol matches,
according to the following table:
| State | Symbol |
| ----------- | -------------------------------------- |
| running | `ZSH_THEME_VAGRANT_PROMPT_RUNNING` |
| not running | `ZSH_THEME_VAGRANT_PROMPT_POWEROFF` |
| poweroff | `ZSH_THEME_VAGRANT_PROMPT_POWEROFF` |
| paused | `ZSH_THEME_VAGRANT_PROMPT_SUSPENDED` |
| saved | `ZSH_THEME_VAGRANT_PROMPT_SUSPENDED` |
| suspended | `ZSH_THEME_VAGRANT_PROMPT_SUSPENDED` |
| not created | `ZSH_THEME_VAGRANT_PROMPT_NOT_CREATED` |

View file

@ -1,16 +1,18 @@
function vagrant_prompt_info() { function vagrant_prompt_info() {
if [[ ! -d .vagrant || ! -f Vagrantfile ]]; then
return
fi
local vm_states vm_state local vm_states vm_state
if [[ -d .vagrant && -f Vagrantfile ]]; then vm_states=(${(f)"$(vagrant status 2> /dev/null | sed -nE 's/^[^ ]* *([[:alnum:] ]*) \([[:alnum:]_]+\)$/\1/p')"})
vm_states=(${(f)"$(vagrant status 2> /dev/null | sed -nE 's/^.*(saved|poweroff|running|not created) \([[:alnum:]_]+\)$/\1/p')"})
printf '%s' $ZSH_THEME_VAGRANT_PROMPT_PREFIX printf '%s' $ZSH_THEME_VAGRANT_PROMPT_PREFIX
for vm_state in $vm_states; do for vm_state in $vm_states; do
case "$vm_state" in case "$vm_state" in
saved) printf '%s' $ZSH_THEME_VAGRANT_PROMPT_SUSPENDED ;;
running) printf '%s' $ZSH_THEME_VAGRANT_PROMPT_RUNNING ;; running) printf '%s' $ZSH_THEME_VAGRANT_PROMPT_RUNNING ;;
poweroff) printf '%s' $ZSH_THEME_VAGRANT_PROMPT_POWEROFF ;; "not running"|poweroff) printf '%s' $ZSH_THEME_VAGRANT_PROMPT_POWEROFF ;;
paused|saved|suspended) printf '%s' $ZSH_THEME_VAGRANT_PROMPT_SUSPENDED ;;
"not created") printf '%s' $ZSH_THEME_VAGRANT_PROMPT_NOT_CREATED ;; "not created") printf '%s' $ZSH_THEME_VAGRANT_PROMPT_NOT_CREATED ;;
esac esac
done done
printf '%s' $ZSH_THEME_VAGRANT_PROMPT_SUFFIX printf '%s' $ZSH_THEME_VAGRANT_PROMPT_SUFFIX
fi
} }