From abae36d96dd8cd7c6abf6650204ccf4791948dd9 Mon Sep 17 00:00:00 2001 From: Joshua McKinney Date: Fri, 19 Aug 2016 12:06:59 -0500 Subject: [PATCH] Refactor brew-cask zsh completion to functions --- share/zsh/site-functions/_brew_cask | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/share/zsh/site-functions/_brew_cask b/share/zsh/site-functions/_brew_cask index 59fe179501..d31d717920 100644 --- a/share/zsh/site-functions/_brew_cask +++ b/share/zsh/site-functions/_brew_cask @@ -30,11 +30,17 @@ # SOFTWARE. __brew_all_casks() { - brew cask search + local -a list + local expl + list=( $(brew cask search) ) + _wanted list expl 'all casks' compadd -a list } __brew_installed_casks() { - brew cask list|sed 's/(!)//' + local -a list + local expl + list=( $(brew cask list|sed 's/(!)//') ) + _wanted list expl 'installed casks' compadd -a list } _brew_cask() @@ -69,15 +75,11 @@ _brew_cask() ) _describe -t commands "brew cask subcommand" subcommands ;; (options) - local -a casks installed_casks - local expl case "$line[1]" in list|uninstall) - installed_casks=($(__brew_installed_casks)) - _wanted installed_casks expl 'installed casks' compadd -a installed_casks ;; + __brew_installed_casks ;; audit|cat|edit|fetch|home|info|install|zap) - casks=($(__brew_all_casks)) - _wanted casks expl 'all casks' compadd -a casks ;; + __brew_all_casks ;; esac ;; esac }