aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Mike Kelly <pioto@pioto.org> 2007-03-05 08:55:22 +0000
committerAvatar Mike Kelly <pioto@pioto.org> 2007-03-05 08:55:22 +0000
commit7cdcbac2cb7a621a71b4cdef573857ad43e9e15d (patch)
treeceeb7ed5fffd36573492ee2b677f26eb025755d7
parent45cea1df648c2ed71f21cd0055600e76c846fda3 (diff)
downloadpaludis-7cdcbac2cb7a621a71b4cdef573857ad43e9e15d.tar.gz
paludis-7cdcbac2cb7a621a71b4cdef573857ad43e9e15d.tar.xz
Update bash completion to be in-sync with current trunk.
-rw-r--r--bash-completion/adjutrix8
-rw-r--r--bash-completion/paludis17
-rw-r--r--bash-completion/qualudis3
3 files changed, 19 insertions, 9 deletions
diff --git a/bash-completion/adjutrix b/bash-completion/adjutrix
index 8f83a0a..1180460 100644
--- a/bash-completion/adjutrix
+++ b/bash-completion/adjutrix
@@ -41,6 +41,8 @@ _adjutrix() {
--what-needs-keywording -w \
--display-profiles-use -u \
--display-default-system-resolution -S \
+ --build-downgrade-check-list \
+ --downgrade-check \
--version -V \
--help -h \
--log-level \
@@ -66,12 +68,12 @@ _adjutrix() {
return 0
;;
- --category)
+ --category|-C)
[[ -z "${repodir}" ]] && return 0
COMPREPLY=($(compgen -W "$(< ${repodir}/profiles/categories)" -- "${cur}"))
return 0
;;
- --package)
+ --package|-P)
[[ -z "${repodir}" ]] && return 0
# borrowed from the gentoo bashcomp script
local p
@@ -100,7 +102,7 @@ _adjutrix() {
return 0
;;
- --profile|-p)
+ --profile)
COMPREPLY=($(compgen -W "$(sed -n 's,^[^#][^[:space:]]*[[:space:]]*\([^[:space:]]*\).*,\1,p' "${repodir}/profiles/profiles.desc")" -- "${cur}"))
return 0
;;
diff --git a/bash-completion/paludis b/bash-completion/paludis
index fff17e1..e35c127 100644
--- a/bash-completion/paludis
+++ b/bash-completion/paludis
@@ -9,7 +9,12 @@ _paludis_packagenames() {
for names_cache in $(paludis --list-repositories --log-level silent |sed -n 's,^[[:space:]]*names_cache:[[:space:]]*\(.*\)$,\1,p')
do
pushd "${names_cache}" 1>/dev/null
- echo *
+ for d in * ; do
+ [[ -d "${d}" ]] || continue
+ pushd "${d}" 1>/dev/null
+ echo "${1}"*
+ popd 1>/dev/null
+ done
popd 1>/dev/null
done
}
@@ -60,7 +65,7 @@ _paludis() {
general_opts="--log-level \
--no-colour \
--no-color \
- --config-suffix -c \
+ --environment -E \
--resume-command-template"
deplist_opts="--dl-reinstall \
@@ -85,8 +90,9 @@ _paludis() {
query_opts="--show-deps -D \
--show-metadata -M"
install_opts="--pretend -p \
+ --destinations -d \
--preserve-world -1 \
- --add-to-world-atom \
+ --add-to-world-spec \
--no-config-protection \
--debug-build \
--fetch -f \
@@ -95,6 +101,7 @@ _paludis() {
--show-use-descriptions \
${deplist_opts}"
uninstall_opts="--pretend -p \
+ --destinations -d \
--preserve-world -1 \
--no-config-protection \
--show-reasons \
@@ -272,7 +279,7 @@ _paludis() {
return 0
;;
--package)
- COMPREPLY=($(compgen -W "$(_paludis_packagenames)" -- "${cur}"))
+ COMPREPLY=($(compgen -W "$(_paludis_packagenames "${cur}")" -- "${cur}"))
return 0
;;
--set)
@@ -330,7 +337,7 @@ _paludis() {
COMPREPLY=(
$(compgen -W "$(_paludis_dolist sets)" -- "${cur}")
$(compgen -W "$(_paludis_dolist categories)" -- "${cur}")
- $(compgen -W "$(_paludis_packagenames)" -- "${cur}")
+ $(compgen -W "$(_paludis_packagenames "${cur}")" -- "${cur}")
)
_filedir
return 0
diff --git a/bash-completion/qualudis b/bash-completion/qualudis
index 4298ccc..0254233 100644
--- a/bash-completion/qualudis
+++ b/bash-completion/qualudis
@@ -37,7 +37,8 @@ _qualudis() {
--quiet -q \
--log-level -L \
--message-level -M \
- --write-cache-dir"
+ --write-cache-dir \
+ --master-repository-dir"
case "${cur}" in
-*)