aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ingmar Vanhassel <ingmar@exherbo.org> 2009-01-02 04:52:44 +0100
committerAvatar Ingmar Vanhassel <ingmar@exherbo.org> 2009-01-08 17:38:31 +0100
commit5ad0a637c880b187fcc24dc33a6f15eb18e0dfb5 (patch)
tree0ad1ae4a7f52049ec350af44cb67f54601510f88
parent06ef544b47fb7644736a1db31e810cbde9fcd492 (diff)
downloadpaludis-5ad0a637c880b187fcc24dc33a6f15eb18e0dfb5.tar.gz
paludis-5ad0a637c880b187fcc24dc33a6f15eb18e0dfb5.tar.xz
zsh-completion: ++descriptions.
-rw-r--r--zsh-completion/_adjutrix2
-rw-r--r--zsh-completion/_importare26
-rw-r--r--zsh-completion/_inquisitio4
-rw-r--r--zsh-completion/_paludis4
-rw-r--r--zsh-completion/_reconcilio26
5 files changed, 37 insertions, 25 deletions
diff --git a/zsh-completion/_adjutrix b/zsh-completion/_adjutrix
index 1aa1993..b4cbf5d 100644
--- a/zsh-completion/_adjutrix
+++ b/zsh-completion/_adjutrix
@@ -31,7 +31,7 @@ _adjutrix() {
'--unstable[Accept ~arch as well as arch]'
)
general_options=(
- '--log-level[Specify the log level]:log level:((debug\:Show\ debug\ output qa\:Show\ QA\ messages\ and\ warnings\ only warning\:Show\ warnings\ only silent\:Suppress\ all\ log\ messages))'
+ '--log-level[Specify the log level]:log level:((debug\:"Show debug output (noisy)" qa\:"Show QA messages and warnings only (default)" warning\:"Show warnings only" silent\:"Suppress all log messages (UNSAFE)"))'
'(--no-colour --no-color)'{--no-colour,--no-color}"[Do not use colour]"
'(--repository-dir -D)'{--repository-dir,-D}'[Where to find the repository]:repository:_files -/'
)
diff --git a/zsh-completion/_importare b/zsh-completion/_importare
index 9f665e3..8d0d4b2 100644
--- a/zsh-completion/_importare
+++ b/zsh-completion/_importare
@@ -5,14 +5,14 @@
# Written by Baptiste Daroussin <baptux at free.fr>
_importare() {
- local actions action_options general_options source_options metadata_options install_options deplist_options
+ local actions action_options general_options source_options metadata_options install_options deplist_descriptions deplist_options
actions=(
--install
--version -V
--help -h
)
general_options=(
- '--log-level[Specify the log level]:log level:((debug\:Show\ debug\ output qa\:Show\ QA\ messages\ and\ warnings\ only warning\:Show\ warnings\ only silent\:Suppress\ all\ log\ messages))'
+ '--log-level[Specify the log level]:log level:((debug\:"Show debug output (noisy)" qa\:"Show QA messages and warnings only (default)" warning\:"Show warnings only" silent\:"Suppress all log messages (UNSAFE)"))'
'(--no-colour --no-color)'{--no-colour,--no-color}"[Do not use colour]"
"(--environment -E)"{-E,--environment}"[Environment specification]:environment specification: "
"--compact[Display output using one line per entry]"
@@ -34,6 +34,12 @@ _importare() {
"--show-package-descriptions[Show package descriptions]:When:((none\:Don\'t\ show\ any\ descriptions new\:Show\ descriptions\ for\ new\ packages all\:Show\ descriptions\ for\ all\ packages))"
"--continue-on-failure[Whether to continue after a fetch or install error]:When:((if-fetch-only\:If\ fetching\ only never\:Never if-satisfied\:If\ remaining\ packages\ dependencies\ are\ satisfied if-independent\:If\ independent\ of\ failed\ and\ skipped\ packages always\:Always))"
)
+ deplist_descriptions='
+ pre\:"As pre dependencies"
+ pre-or-post\:"As pre dependencies, or post dependencies where needed"
+ post\:"As post dependencies"
+ try-post\:"As post dependencies, with no error for failures"
+ discard\:"Discard (default)"'
deplist_options=(
"--dl-blocks[How to handle blocks]:How:(accumulate error discard)"
"--dl-override-masks[Zero or more mask kinds that can be overridden as necessary]:What:(none tilde-keyword unkeyworded profile repository license)"
@@ -43,14 +49,14 @@ _importare() {
"--dl-reinstall-scm[When to reinstall scm packages]:When:(never always daily weekly)"
"--dl-reinstall-targets[When to reinstall targets]:When:(auto never always)"
"--dl-upgrade[When to upgrade packages]:When:(always as-needed)"
- "--dl-deps-default[Override default behaviour for all dependency classes]:How:(pre pre-or-post post try-post discard)"
- "--dl-installed-deps-pre[How to handle pre dependencies for installed packages]:How:(pre pre-or-post post try-post discard)"
- "--dl-installed-deps-runtime[How to handle runtime dependencies for installed packages]:How:(pre pre-or-post post try-post discard)"
- "--dl-installed-deps-post[How to handle post dependencies for installed packages]:How:(pre pre-or-post post try-post discard)"
- "--dl-uninstalled-deps-pre[How to handle pre dependencies for uninstalled packages]:How:(pre pre-or-post post try-post discard)"
- "--dl-uninstalled-deps-post[How to handle post dependencies for uninstalled packages]:How:(pre pre-or-post post try-post discard)"
- "--dl-uninstalled-deps-runtime[How to handle runtime dependencies for uninstalled packages]:How:(pre pre-or-post post try-post discard)"
- "--dl-uninstalled-deps-suggested[How to handle suggested dependencies for uninstalled packages]:How:(pre pre-or-post post try-post discard)"
+ "--dl-deps-default[Override default behaviour for all dependency classes]:How:(($deplist_descriptions))"
+ "--dl-installed-deps-pre[How to handle pre dependencies for installed packages]:How:(($deplist_descriptions))"
+ "--dl-installed-deps-runtime[How to handle runtime dependencies for installed packages]:How:(($deplist_descriptions))"
+ "--dl-installed-deps-post[How to handle post dependencies for installed packages]:How:(($deplist_descriptions))"
+ "--dl-uninstalled-deps-pre[How to handle pre dependencies for uninstalled packages]:How:(($deplist_descriptions))"
+ "--dl-uninstalled-deps-post[How to handle post dependencies for uninstalled packages]:How:(($deplist_descriptions))"
+ "--dl-uninstalled-deps-runtime[How to handle runtime dependencies for uninstalled packages]:How:(($deplist_descriptions))"
+ "--dl-uninstalled-deps-suggested[How to handle suggested dependencies for uninstalled packages]:How:(($deplist_descriptions))"
"--dl-circular[How to handle circular dependencies]:How:(error discard)"
"--dl-fall-back[When to fall back to installed packages]:When:(as-needed-except-targets as-needed never)"
"--dl-new-slots[When to pull in new slots (works with --dl-upgrade)]:When:(always as-needed)"
diff --git a/zsh-completion/_inquisitio b/zsh-completion/_inquisitio
index 1f56360..937d3ed 100644
--- a/zsh-completion/_inquisitio
+++ b/zsh-completion/_inquisitio
@@ -18,7 +18,7 @@ _inquisitio() {
"(--enabled-only -e)"{-e,--enabled-only}"[When searching spec trees, only look in enabled subtrees]"
"(--not -n)"{-n,--not}"[Select packages that do not match]"
)
-
+
filter_options=(
"(--repository -r)"{-r,--repository}"[Matches with this repository name only]:repository:_paludis_packages repositories"
"--repository-format[Matches with this repository format only]:format:_paludis_packages repository-formats"
@@ -30,7 +30,7 @@ _inquisitio() {
)
general_options=(
- "--log-level[Specify the log level]:log level:((debug\:Show\ debug\ output qa\:Show\ QA\ messages\ and\ warnings\ only warning\:Show\ warnings\ only silent\:Suppress\ all\ log\ messages))"
+ '--log-level[Specify the log level]:log level:((debug\:"Show debug output (noisy)" qa\:"Show QA messages and warnings only (default)" warning\:"Show warnings only" silent\:"Suppress all log messages (UNSAFE)"))'
"(--no-colour --no-color)"{--no-colour,--no-color}"[Do not use colour]"
"(--environment -E)"{-E,--environment}"[Environment specification]:Environment: "
)
diff --git a/zsh-completion/_paludis b/zsh-completion/_paludis
index a0f59ec..a378172 100644
--- a/zsh-completion/_paludis
+++ b/zsh-completion/_paludis
@@ -52,14 +52,14 @@ _paludis() {
"(: -)--list-dep-tag-categories[List known dep tag categories]"
)
general_args=(
- '--log-level[Specify the log level]:log level:((debug\:"Show debug output (noisy)" qa\:"Show QA messages and warnings only (default)" warning\:"Show warnings only" silent\:"Suppress all log messages (UNSAFE)"))'
+ '--log-level[Specify the log level]:log level:((debug\:"Show debug output (noisy)" qa\:"Show QA messages and warnings only (default)" warning\:"Show warnings only" silent\:"Suppress all log messages (UNSAFE)"))'
"(--no-colour --no-color)"{--no-colour,--no-color}"[Do not use colour]"
"--no-suggestions[Do not give suggestions if an unknown name is specified]"
"(--environment -E)"{-E,--environment}"[Environment specification]"
"--resume-command-template[Save the resume command to a file made using mkstemp(3)]:file:_files"
"--compact[Display output using one line per entry]"
)
-
+
action_args=(
"($actions)"{-q,--query}"[Query for package information]"
"($actions)"{-i,--install}"[Install one or more packages]"
diff --git a/zsh-completion/_reconcilio b/zsh-completion/_reconcilio
index 85e3f1a..180f6ab 100644
--- a/zsh-completion/_reconcilio
+++ b/zsh-completion/_reconcilio
@@ -4,14 +4,14 @@
# ZSH completion for adjutrix
# Written by Baptiste Daroussin <baptux at free.fr>
_reconcilio() {
- local actions action_options general_options fix_linkage_options install_options deplist_options
+ local actions action_options general_options fix_linkage_options install_options deplist_descriptions deplist_options
actions=(
--fix-linkage
--version -V
--help -h
)
general_options=(
- '--log-level[Specify the log level]:log level:((debug\:Show\ debug\ output qa\:Show\ QA\ messages\ and\ warnings\ only warning\:Show\ warnings\ only silent\:Suppress\ all\ log\ messages))'
+ '--log-level[Specify the log level]:log level:((debug\:"Show debug output (noisy)" qa\:"Show QA messages and warnings only (default)" warning\:"Show warnings only" silent\:"Suppress all log messages (UNSAFE)"))'
'(--no-colour --no-color)'{--no-colour,--no-color}"[Do not use colour]"
"(--environment -E)"{-E,--environment}"[Environment specification]"
"--exact[Rebuild the same package version that is currently installed]"
@@ -31,6 +31,12 @@ _reconcilio() {
"--show-package-descriptions[Show package descriptions]:When:((none\:Don\'t\ show\ any\ descriptions new\:Show\ descriptions\ for\ new\ packages all\:Show\ descriptions\ for\ all\ packages))"
"--continue-on-failure[Whether to continue after a fetch or install error]:When:((if-fetch-only\:If\ fetching\ only never\:Never if-satisfied\:If\ remaining\ packages\ dependencies\ are\ satisfied if-independent\:If\ independent\ of\ failed\ and\ skipped\ packages always\:Always))"
)
+ deplist_descriptions='
+ pre\:"As pre dependencies"
+ pre-or-post\:"As pre dependencies, or post dependencies where needed"
+ post\:"As post dependencies"
+ try-post\:"As post dependencies, with no error for failures"
+ discard\:"Discard (default)"'
deplist_options=(
"--dl-blocks[How to handle blocks]:How:(accumulate error discard)"
"--dl-override-masks[Zero or more mask kinds that can be overridden as necessary]:What:(none tilde-keyword unkeyworded profile repository license)"
@@ -40,14 +46,14 @@ _reconcilio() {
"--dl-reinstall-scm[When to reinstall scm packages]:When:(never always daily weekly)"
"--dl-reinstall-targets[When to reinstall targets]:When:(auto never always)"
"--dl-upgrade[When to upgrade packages]:When:(always as-needed)"
- "--dl-deps-default[Override default behaviour for all dependency classes]:How:(pre pre-or-post post try-post discard)"
- "--dl-installed-deps-pre[How to handle pre dependencies for installed packages]:How:(pre pre-or-post post try-post discard)"
- "--dl-installed-deps-runtime[How to handle runtime dependencies for installed packages]:How:(pre pre-or-post post try-post discard)"
- "--dl-installed-deps-post[How to handle post dependencies for installed packages]:How:(pre pre-or-post post try-post discard)"
- "--dl-uninstalled-deps-pre[How to handle pre dependencies for uninstalled packages]:How:(pre pre-or-post post try-post discard)"
- "--dl-uninstalled-deps-post[How to handle post dependencies for uninstalled packages]:How:(pre pre-or-post post try-post discard)"
- "--dl-uninstalled-deps-runtime[How to handle runtime dependencies for uninstalled packages]:How:(pre pre-or-post post try-post discard)"
- "--dl-uninstalled-deps-suggested[How to handle suggested dependencies for uninstalled packages]:How:(pre pre-or-post post try-post discard)"
+ "--dl-deps-default[Override default behaviour for all dependency classes]:How:(($deplist_descriptions))"
+ "--dl-installed-deps-pre[How to handle pre dependencies for installed packages]:How:(($deplist_descriptions))"
+ "--dl-installed-deps-runtime[How to handle runtime dependencies for installed packages]:How:(($deplist_descriptions))"
+ "--dl-installed-deps-post[How to handle post dependencies for installed packages]:How:(($deplist_descriptions))"
+ "--dl-uninstalled-deps-pre[How to handle pre dependencies for uninstalled packages]:How:(($deplist_descriptions))"
+ "--dl-uninstalled-deps-post[How to handle post dependencies for uninstalled packages]:How:(($deplist_descriptions))"
+ "--dl-uninstalled-deps-runtime[How to handle runtime dependencies for uninstalled packages]:How:(($deplist_descriptions))"
+ "--dl-uninstalled-deps-suggested[How to handle suggested dependencies for uninstalled packages]:How:(($deplist_descriptions))"
"--dl-circular[How to handle circular dependencies]:How:(error discard)"
"--dl-fall-back[When to fall back to installed packages]:When:(as-needed-except-targets as-needed never)"
"--dl-new-slots[When to pull in new slots (works with --dl-upgrade)]:When:(always as-needed)"