- more urpmi updates from Guillaume Rousse <rousse@ccr.jussieu.fr>

This commit is contained in:
ianmacd 2003-04-23 05:30:46 +00:00
parent 11a8ef47f8
commit f8da9f4aa9

View File

@ -1,6 +1,6 @@
# bash_completion - some programmable completion functions for bash 2.05b # bash_completion - some programmable completion functions for bash 2.05b
# #
# $Id: bash_completion,v 1.554 2003/04/20 22:30:40 ianmacd Exp $ # $Id: bash_completion,v 1.555 2003/04/23 07:30:46 ianmacd Exp $
# #
# Copyright (C) Ian Macdonald <ian@caliban.org> # Copyright (C) Ian Macdonald <ian@caliban.org>
# #
@ -3455,7 +3455,6 @@ have urpmq && {
_urpmi_media() _urpmi_media()
{ {
local media local media
# first try new urpmq option to get media list # first try new urpmq option to get media list
media=$( urpmq --list-media 2>/dev/null ) media=$( urpmq --list-media 2>/dev/null )
# default to old manual media extraction # default to old manual media extraction
@ -3467,7 +3466,6 @@ _urpmi_media()
_urpmi_packages() _urpmi_packages()
{ {
local packages media local packages media
# find if a particular media has been specified # find if a particular media has been specified
for (( i=1; i < COMP_CWORD; i++ )); do for (( i=1; i < COMP_CWORD; i++ )); do
if [[ "${COMP_WORDS[i]}" == --media ]]; then if [[ "${COMP_WORDS[i]}" == --media ]]; then
@ -3515,12 +3513,14 @@ _urpmi()
if [[ "$cur" == -* ]]; then if [[ "$cur" == -* ]]; then
# return list of available options # return list of available options
COMPREPLY=( $( compgen -W '-a -p -P -y -s -q -v --help \ COMPREPLY=( $( compgen -W '-a -p -P -y -s -q -v -h --help \
--update --media --excludemedia --sortmedia --synthesis \ --update --media --excludemedia --sortmedia \
--auto --auto-select --fuzzy --src --install-src --clean \ --synthesis --auto --auto-select --fuzzy --src \
--noclean --force --allow-nodeps --allow-force --parallel \ --install-src --clean --noclean --force \
--wget --curl --limit-rate --proxy --proxy-user --bug --env \ --allow-nodeps --allow-force --parallel --wget --curl \
--X --best-output --verify-rpm --test --excludepath' -- $cur ) ) --limit-rate --proxy --proxy-user --bug --env \
--X --best-output --verify-rpm --test --excludepath' \
-- $cur ) )
else else
# return rpm files and available packages # return rpm files and available packages
_urpmi_packages _urpmi_packages
@ -3553,11 +3553,12 @@ _urpmq()
if [[ "$cur" == -* ]]; then if [[ "$cur" == -* ]]; then
# return list of available options # return list of available options
COMPREPLY=( $( compgen -W '-h -v -d -u -c -P -R -y -s -g -r -f\ COMPREPLY=( $( compgen -W '-v -d -u -c -P -R -y -s -g -r -f -h\
--help --update --media --excludemedia --sortmedia \ --help --update --media --excludemedia --sortmedia \
--synthesis --auto-select --fuzzy --list --list-media \ --synthesis --auto-select --fuzzy --list --list-media \
--list-nodes --list-aliases --src --headers --sources \ --list-nodes --list-aliases --src --headers --sources \
--force --parallel --wget --curl --proxy --proxy-user' -- $cur)) --force --parallel --wget --curl --proxy --proxy-user'\
-- $cur))
else else
# return rpm files and available packages # return rpm files and available packages
_urpmi_packages _urpmi_packages
@ -3578,7 +3579,8 @@ _urpme()
if [[ "$cur" == -* ]]; then if [[ "$cur" == -* ]]; then
# return list of available options # return list of available options
COMPREPLY=( $( compgen -W '-a --help --auto --test --parallel' -- $cur ) ) COMPREPLY=( $( compgen -W '-a -h --help --auto --test \
--parallel' -- $cur ) )
else else
# return list of available packages # return list of available packages
_rpm_installed_packages _rpm_installed_packages
@ -3599,10 +3601,10 @@ _urpmf()
if [[ "$cur" == -* ]]; then if [[ "$cur" == -* ]]; then
# return list of available options # return list of available options
COMPREPLY=( $( compgen -W '-i -f -e -a -o --help --update \ COMPREPLY=( $( compgen -W '-i -f -e -a -o --help --update \
--media --synthesis --verbose --quiet --all \ --media --synthesis --verbose --quiet --all --name \
--name --group --size --epoch --summary \ --group --size --epoch --summary --description \
--description --provides --requires \ --provides --requires --files --conflicts --obsoletes'\
--files --conflicts \ --obsoletes ' -- $cur ) ) -- $cur ) )
else else
# return available files # return available files
_filedir _filedir
@ -3622,8 +3624,9 @@ _urpmi_update()
if [[ "$cur" == -* ]]; then if [[ "$cur" == -* ]]; then
# return list of available options # return list of available options
COMPREPLY=( $( compgen -W '-a -c -d -f --help --curl --wget \ COMPREPLY=( $( compgen -W '-a -c -d -f -h --help --curl \
--proxy --proxy-user' -- $cur)) --wget --limit-rate --proxy --proxy-user \
--update' -- $cur))
else else
# return list of available media # return list of available media
_urpmi_media _urpmi_media
@ -3643,8 +3646,10 @@ _urpmi_addmedia()
if [[ "$cur" == -* ]]; then if [[ "$cur" == -* ]]; then
# return list of available options # return list of available options
COMPREPLY=( $( compgen -W '-c -h -f --help --wget --curl \ COMPREPLY=( $( compgen -W '-c -f -h --help --wget --curl \
--proxy --proxy-user --update --distrib' -- $cur ) ) --limit-rate --proxy --proxy-user --update \
--probe-synthesis --probe-hdlist --no-probe --distrib \
--env --version --arch' -- $cur ) )
else else
# count number of mandatory args given sofar # count number of mandatory args given sofar
args=$COMP_CWORD args=$COMP_CWORD
@ -3684,7 +3689,7 @@ _urpmi_removemedia()
if [[ "$cur" == -* ]]; then if [[ "$cur" == -* ]]; then
# if word begins with a dash, return list of available options # if word begins with a dash, return list of available options
COMPREPLY=( $( compgen -W '-a -c --help' -- $cur ) ) COMPREPLY=( $( compgen -W '-a -c -h --help' -- $cur ) )
else else
# elsewhere, return list of available media # elsewhere, return list of available media
_urpmi_media _urpmi_media