diff options
author | 2007-11-11 19:41:56 +0000 | |
---|---|---|
committer | 2007-11-11 19:41:56 +0000 | |
commit | 519877804ed78d43d3635f910b5bcb1fdc34312e (patch) | |
tree | b68a4c278d0897aff32610fa5287949a6aba27f8 /bash-completion | |
parent | 1d45867677c8591feafaf15b7f22a286d71c4aa6 (diff) | |
download | paludis-519877804ed78d43d3635f910b5bcb1fdc34312e.tar.gz paludis-519877804ed78d43d3635f910b5bcb1fdc34312e.tar.xz |
More bash-completion updates from zlin.
Diffstat (limited to 'bash-completion')
-rw-r--r-- | bash-completion/contrarius | 9 | ||||
-rw-r--r-- | bash-completion/importare | 21 | ||||
-rw-r--r-- | bash-completion/inquisitio | 35 | ||||
-rw-r--r-- | bash-completion/paludis | 2 | ||||
-rw-r--r-- | bash-completion/reconcilio | 14 |
5 files changed, 50 insertions, 31 deletions
diff --git a/bash-completion/contrarius b/bash-completion/contrarius index 1dec16faa..97233e7ea 100644 --- a/bash-completion/contrarius +++ b/bash-completion/contrarius @@ -15,20 +15,13 @@ _contrarius() { --help -h \ --fetch -f \ --pretend -p \ + --environment -E \ --show-reasons \ --stage -s \ --target -t \ --headers -H \ --always-rebuild -r \ --debug-build \ - --binutils-name \ - --binutils-version \ - --gcc-name \ - --gcc-version \ - --headers-name \ - --headers-version \ - --libc-name \ - --libc-version \ --verbose -v \ --log-level -L \ --no-colour -C \ diff --git a/bash-completion/importare b/bash-completion/importare index d9a139af1..c2b6b1aee 100644 --- a/bash-completion/importare +++ b/bash-completion/importare @@ -20,8 +20,13 @@ _importare() { general_opts="--log-level \ --no-colour \ --no-color \ - --environment -E" + --environment -E \ + --compact" source_opts="--location -l" + metadata_opts="--description -D \ + --build-dependency -B \ + --run-dependency -R \ + --preserve-metadata -P" deplist_opts="--dl-reinstall \ --dl-reinstall-scm \ --dl-upgrade \ @@ -45,11 +50,13 @@ _importare() { --no-config-protection \ --show-reasons \ --show-use-descriptions \ + --show-package-descriptions \ --continue-on-failure \ ${source_opts} \ + ${metadata_opts} \ ${deplist_opts}" - all_opts="${action_opts} ${general_opts} ${source_opts} ${deplist_opts} ${install_opts} ${install_opts}" + all_opts="${action_opts} ${general_opts} ${source_opts} ${metadata_opts} ${deplist_opts} ${install_opts} ${install_opts}" local x for x in "${COMP_WORDS[@]}" ; do @@ -77,7 +84,7 @@ _importare() { *) case "${prev}" in ## Enum operators - --log-level|-L) + --log-level) COMPREPLY=($(compgen -W "debug qa warning silent" -- "${cur}")) return 0 ;; @@ -89,8 +96,12 @@ _importare() { COMPREPLY=($(compgen -W "none new changed all" -- "${cur}")) return 0 ;; + --show-package-descriptions) + COMPREPLY=($(compgen -W "none new all" -- "${cur}")) + return 0 + ;; --continue-on-failure) - COMPREPLY=($(compgen -W "if-fetch-only never if-satisfied always" -- "${cur}")) + COMPREPLY=($(compgen -W "if-fetch-only never if-satisfied if-independent always" -- "${cur}")) return 0 ;; @@ -137,7 +148,7 @@ _importare() { return 0 ;; --dl-override-masks) - COMPREPLY=($(compgen -W "tilde-keyword unkeyworded profile repository license" -- "${cur}")) + COMPREPLY=($(compgen -W "none tilde-keyword unkeyworded repository license" -- "${cur}")) return 0 ;; --dl-fall-back) diff --git a/bash-completion/inquisitio b/bash-completion/inquisitio index 5879dfd2b..fa5fa0de7 100644 --- a/bash-completion/inquisitio +++ b/bash-completion/inquisitio @@ -14,16 +14,25 @@ _inquisitio() { opts="--search -s \ --version -V \ --help -h \ - --log-level -L \ - --no-colour -C \ + --log-level \ + --no-colour \ --no-color \ - --config-suffix -c \ + --environment -E \ + --keys -k \ --matcher -m \ - --extractors -e \ - --repository \ + --flatten -f \ + --enabled-only -e \ + --not -n \ + --repository -r \ --repository-format \ --category \ - --package" + --package \ + --visible-only -v \ + --all-versions -a \ + --kind -K \ + --compact \ + --show-dependencies -D \ + --show-metadata -M" case "${cur}" in -*) @@ -33,21 +42,17 @@ _inquisitio() { *) case "${prev}" in ## Enum operators - --log-level|-L) + --log-level) COMPREPLY=($(compgen -W "debug qa warning silent" -- "${cur}")) return 0 ;; --matcher|-m) - COMPREPLY=($(compgen -W "text pcre" -- "${cur}")) - return 0 - ;; - --extractors|-e) - COMPREPLY=($(compgen -W "description name homepage" -- "${cur}")) + COMPREPLY=($(compgen -W "text pcre exact" -- "${cur}")) return 0 ;; - --repository) + --repository|-r) COMPREPLY=($(compgen -W "$(paludis --log-level silent --list-repositories |sed -n 's,^\* \(.*\),\1,p')" -- "${cur}")) return 0 ;; @@ -59,6 +64,10 @@ _inquisitio() { COMPREPLY=($(compgen -W "$(paludis --log-level silent --list-categories |sed -n 's,^\* \(.*\),\1,p')" -- "${cur}")) return 0 ;; + --kind|-K) + COMPREPLY=($(compgen -W "installable installed all" -- "${cur}")) + return 0 + ;; esac ;; diff --git a/bash-completion/paludis b/bash-completion/paludis index c62d99db4..8ab8131af 100644 --- a/bash-completion/paludis +++ b/bash-completion/paludis @@ -280,7 +280,7 @@ _paludis() { return 0 ;; --dl-override-masks) - COMPREPLY=($(compgen -W "tilde-keyword unkeyworded profile repository license" -- "${cur}")) + COMPREPLY=($(compgen -W "none tilde-keyword unkeyworded repository license" -- "${cur}")) return 0 ;; diff --git a/bash-completion/reconcilio b/bash-completion/reconcilio index 668cfbdd9..c3686864b 100644 --- a/bash-completion/reconcilio +++ b/bash-completion/reconcilio @@ -23,7 +23,8 @@ _reconcilio() { --environment -E \ --exact \ --verbose -v \ - --resume-command-template" + --resume-command-template \ + --compact" deplist_opts="--dl-reinstall \ --dl-reinstall-scm \ --dl-upgrade \ @@ -50,6 +51,7 @@ _reconcilio() { --no-safe-resume \ --show-reasons \ --show-use-descriptions \ + --show-package-descriptions \ --continue-on-failure \ ${deplist_opts}" linkage_opts="--library \ @@ -83,7 +85,7 @@ _reconcilio() { *) case "${prev}" in ## Enum operators - --log-level|-L) + --log-level) COMPREPLY=($(compgen -W "debug qa warning silent" -- "${cur}")) return 0 ;; @@ -103,8 +105,12 @@ _reconcilio() { COMPREPLY=($(compgen -W "none new changed all" -- "${cur}")) return 0 ;; + --show-package-descriptions) + COMPREPLY=($(compgen -W "none new all" -- "${cur}")) + return 0 + ;; --continue-on-failure) - COMPREPLY=($(compgen -W "if-fetch-only never if-satisfied always" -- "${cur}")) + COMPREPLY=($(compgen -W "if-fetch-only never if-satisfied if-independent always" -- "${cur}")) return 0 ;; @@ -146,7 +152,7 @@ _reconcilio() { return 0 ;; --dl-override-masks) - COMPREPLY=($(compgen -W "tilde-keyword unkeyworded profile repository license" -- "${cur}")) + COMPREPLY=($(compgen -W "none tilde-keyword unkeyworded repository license" -- "${cur}")) return 0 ;; --dl-fall-back) |