From 8c3308cf91f6ffb2499032debabbfe3597bb938e Mon Sep 17 00:00:00 2001 From: Sujeet Akula Date: Tue, 30 Aug 2016 16:59:06 +1000 Subject: [PATCH 1/7] Remove --nocolor, update --color desc --- client/equo-completion.zsh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/client/equo-completion.zsh b/client/equo-completion.zsh index e513b71fd..112503f1c 100644 --- a/client/equo-completion.zsh +++ b/client/equo-completion.zsh @@ -31,8 +31,7 @@ _equo_get_available_packages() _arguments -C \ "--help[print help]" \ "--version[print version]" \ - "--nocolor[dont use colors]" \ - "--color[use colors(default)]" \ + "--color[force colored output]" \ "--bashcomp[print bash completion script]"\ '1:command:->cmds' \ '*:subcommand:->args' From cbc9a2d602b56e566a55380259777731b73fc9d6 Mon Sep 17 00:00:00 2001 From: Sujeet Akula Date: Tue, 30 Aug 2016 16:59:25 +1000 Subject: [PATCH 2/7] equo query list called twice for no reason --- client/equo-completion.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/equo-completion.zsh b/client/equo-completion.zsh index 112503f1c..cc4f366ee 100644 --- a/client/equo-completion.zsh +++ b/client/equo-completion.zsh @@ -18,7 +18,7 @@ _equo_get_cmds() _equo_get_installed_packages() { - packages=( ${(f)"$(equo query list installed | equo query list installed | sed 's/.*\///')"} ) + packages=( ${(f)"$(equo query list installed | sed 's/.*\///')"} ) _describe -t packages 'installed packages' packages } From 3844653ee511eb6596fa63cc7e5f27945a21fadd Mon Sep 17 00:00:00 2001 From: Sujeet Akula Date: Tue, 30 Aug 2016 17:00:32 +1000 Subject: [PATCH 3/7] change equo -h parsing --- client/equo-completion.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/equo-completion.zsh b/client/equo-completion.zsh index cc4f366ee..48e35e0f3 100644 --- a/client/equo-completion.zsh +++ b/client/equo-completion.zsh @@ -6,7 +6,7 @@ typeset -A opt_args _equo_get_mirrors() { - mirrors=( ${(f)"$(equo status | grep Repository\ name | cut -d: -f2 | sed 's/^\ *//')"} ) + cmds=( ${(f)"$(equo $1 --help | grep -P '^ (?!(-h|))' | sed -r 's/^ (-*\w+)(, -\w|) +(\w.*)/\1:\3/')"} ) _describe -t packages 'mirrors' mirrors } @@ -38,7 +38,7 @@ _arguments -C \ case $state in cmds) - cmds=( ${(f)"$(equo --help |tr "\t" ":" | grep "^:[^:-]" | sed 's/^:\(\w*\).*:\+/\1:/')"} ) + cmds=( ${(f)"$(equo --help | grep -P '^ (?!(-h|--color|available))' | sed -r 's/^ (\w+)( \[.*\]|) +(\w.*)/\1:\3/')"} ) _describe -t commands 'equo command' cmds ;; args) From d6ad7780fa46ae8f25e3d88272d33219ad148c5f Mon Sep 17 00:00:00 2001 From: Sujeet Akula Date: Tue, 30 Aug 2016 23:48:44 +1000 Subject: [PATCH 4/7] should not have edited this line --- client/equo-completion.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/equo-completion.zsh b/client/equo-completion.zsh index 48e35e0f3..064ec1362 100644 --- a/client/equo-completion.zsh +++ b/client/equo-completion.zsh @@ -6,7 +6,7 @@ typeset -A opt_args _equo_get_mirrors() { - cmds=( ${(f)"$(equo $1 --help | grep -P '^ (?!(-h|))' | sed -r 's/^ (-*\w+)(, -\w|) +(\w.*)/\1:\3/')"} ) + mirrors=( ${(f)"$(equo status | grep Repository\ name | cut -d: -f2 | sed 's/^\ *//')"} ) _describe -t packages 'mirrors' mirrors } From 50f7796fea6b77665db1401c9be96c405b286915 Mon Sep 17 00:00:00 2001 From: Sujeet Akula Date: Tue, 30 Aug 2016 23:49:19 +1000 Subject: [PATCH 5/7] get all the pathological subcommand -h cases --- client/equo-completion.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/equo-completion.zsh b/client/equo-completion.zsh index 064ec1362..79cc9c85e 100644 --- a/client/equo-completion.zsh +++ b/client/equo-completion.zsh @@ -12,7 +12,7 @@ _equo_get_mirrors() _equo_get_cmds() { - cmds=( ${(f)"$(equo $1 --help | tr "\t" ":" | grep "^:[^:]" | sed 's/^:\([^:\ ]*\)[^:]*:*/\1:/')"} ) + cmds=( ${(f)"$(equo $1 --help | sed 's/--multifetch/--multifetch can be/' | sed -r -e '/^(positional|action:)/ {N; d;}' | grep -P '^ (?!-h||{| )' | sed -r 's/^ {2,4}(-*[a-zA-z0-9-]+)(, -\w|) +(\w.*)/\1:\3/')"} ) _describe -t commands 'command params' cmds } From 0b7efb5be935a152e79c68e445b69c2c085b96f1 Mon Sep 17 00:00:00 2001 From: Sujeet Akula Date: Tue, 30 Aug 2016 23:50:37 +1000 Subject: [PATCH 6/7] update aliases in subcommand switch --- client/equo-completion.zsh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/equo-completion.zsh b/client/equo-completion.zsh index 79cc9c85e..4532dcfbe 100644 --- a/client/equo-completion.zsh +++ b/client/equo-completion.zsh @@ -47,7 +47,7 @@ case $state in _equo_get_cmds $line[1] && return 0 _equo_get_installed_packages ;; - install|fetch|search|source|mask|unmask) + install|i|fetch|download|search|s|source|src|mask|unmask) _equo_get_cmds $line[1] && return 0 _equo_get_available_packages $line[-1] ;; @@ -63,7 +63,7 @@ case $state in ;; esac ;; - query) + query|q) case $line[2] in changelog|revdeps|files|needed|removal|graph|revgraph) _equo_get_installed_packages @@ -91,7 +91,7 @@ case $state in notice) _equo_get_mirrors ;; - cleanup|status) + cleanup|status|st|--info|hop) ;; *) _equo_get_cmds $line[1] From 3fc1de1e748b7c813d881c38de5c611cf7694bbd Mon Sep 17 00:00:00 2001 From: Sujeet Akula Date: Wed, 31 Aug 2016 07:49:02 +1000 Subject: [PATCH 7/7] break up the long text processing pipes --- client/equo-completion.zsh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/client/equo-completion.zsh b/client/equo-completion.zsh index 4532dcfbe..78ab845e0 100644 --- a/client/equo-completion.zsh +++ b/client/equo-completion.zsh @@ -12,7 +12,11 @@ _equo_get_mirrors() _equo_get_cmds() { - cmds=( ${(f)"$(equo $1 --help | sed 's/--multifetch/--multifetch can be/' | sed -r -e '/^(positional|action:)/ {N; d;}' | grep -P '^ (?!-h||{| )' | sed -r 's/^ {2,4}(-*[a-zA-z0-9-]+)(, -\w|) +(\w.*)/\1:\3/')"} ) + cmds=( ${(f)"$(equo $1 --help | + sed 's/--multifetch/--multifetch can be/' | + sed -r -e '/^(positional|action:)/ {N; d;}' | + grep -P '^ (?!-h||{| )' | + sed -r 's/^ {2,4}(-*[a-zA-z0-9-]+)(, -\w|) +(\w.*)/\1:\3/')"} ) _describe -t commands 'command params' cmds } @@ -38,7 +42,9 @@ _arguments -C \ case $state in cmds) - cmds=( ${(f)"$(equo --help | grep -P '^ (?!(-h|--color|available))' | sed -r 's/^ (\w+)( \[.*\]|) +(\w.*)/\1:\3/')"} ) + cmds=( ${(f)"$(equo --help | + grep -P '^ (?!(-h|--color|available))' | + sed -r 's/^ (\w+)( \[.*\]|) +(\w.*)/\1:\3/')"} ) _describe -t commands 'equo command' cmds ;; args)