RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-16 12:17:12 +00:00
Code Issues Releases Wiki Activity

zsh completion: perform globbing on binary path

Browse Source 
When trying to use completion for mpv binaries specified with some shell
glob, e.g. ~/dev/mpv/build/mpv, the current code doesn't substitute the
homedir prefix into the path name, resulting in runtime errors about
the file '~/dev/mpv/build/mpv' not being found.

The simple fixed is to use $~var instead of $var whenever expanding the
filename, which performs the same globbing that would otherwise be
performed when executing the command.
This commit is contained in:
Niklas Haas 2021-05-07 22:18:23 +02:00
parent c3ebe7eabd
commit ea89e813f7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etc/_mpv.zsh
View File

@ -42,7 +42,7 @@ function _mpv_generate_arguments {
local -a option_aliases=() local -a option_aliases=()
local list_options_line local list_options_line
for list_options_line in "${(@f)$($words[1] --list-options)}"; do for list_options_line in "${(@f)$($~words[1] --list-options)}"; do
[[ $list_options_line =~ $'^[ \t]+--([^ \t]+)[ \t]*(.*)' ]] || continue [[ $list_options_line =~ $'^[ \t]+--([^ \t]+)[ \t]*(.*)' ]] || continue
@ -146,7 +146,7 @@ function _mpv_generate_arguments {
function _mpv_generate_protocols { function _mpv_generate_protocols {
_mpv_completion_protocols=() _mpv_completion_protocols=()
local list_protos_line local list_protos_line
for list_protos_line in "${(@f)$($words[1] --list-protocols)}"; do for list_protos_line in "${(@f)$($~words[1] --list-protocols)}"; do
if [[ $list_protos_line =~ $'^[ \t]+(.*)' ]]; then if [[ $list_protos_line =~ $'^[ \t]+(.*)' ]]; then
_mpv_completion_protocols+="$match[1]" _mpv_completion_protocols+="$match[1]"
fi fi
@ -158,7 +158,7 @@ function _mpv_generate_if_changed {
# on the first run and re-generates it if the executable being completed for # on the first run and re-generates it if the executable being completed for
# is different than the one we used to generate the cached list. # is different than the one we used to generate the cached list.
typeset -gA _mpv_completion_binary typeset -gA _mpv_completion_binary
local current_binary=${words[1]:c} local current_binary=${~words[1]:c}
zmodload -F zsh/stat b:zstat zmodload -F zsh/stat b:zstat
current_binary+=T$(zstat +mtime $current_binary) current_binary+=T$(zstat +mtime $current_binary)
if [[ $_mpv_completion_binary[$1] != $current_binary ]]; then if [[ $_mpv_completion_binary[$1] != $current_binary ]]; then
@ -207,7 +207,7 @@ case $state in
esac esac
local -a values local -a values
local current local current
for current in "${(@f)$($words[1] --${option_name}=help)}"; do for current in "${(@f)$($~words[1] --${option_name}=help)}"; do
[[ $current =~ $pattern ]] || continue; [[ $current =~ $pattern ]] || continue;
local name=${match[name_group]//:/\\:} desc=${match[desc_group]} local name=${match[name_group]//:/\\:} desc=${match[desc_group]}
if [[ -n $desc ]]; then if [[ -n $desc ]]; then