1.1 --- a/data/Makefile.am	Mon Jun 23 10:24:30 2008 -0400
     1.2 +++ b/data/Makefile.am	Mon Jun 23 10:31:04 2008 -0400
     1.3 @@ -4,7 +4,7 @@
     1.4  pkgconfig_DATA = razor.pc
     1.5  
     1.6  bashcompletiondir = ${SYSCONFDIR}/bash_completion.d
     1.7 -dist_bashcompletion_DATA = bash-completion.sh
     1.8 +dist_bashcompletion_DATA = razor.sh
     1.9  
    1.10  clean-local :
    1.11  	rm -f *~

     2.1 --- a/data/bash-completion.sh	Mon Jun 23 10:24:30 2008 -0400
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,47 +0,0 @@
     2.4 -__razor_commands () {
     2.5 -    local IFS=$'\n'
     2.6 -    COMPREPLY=($(IFS=: compgen -S' ' -W "info:list-requires:list-provides:list-files:list-file-packages:list-package-files:what-requires:what-provides:import-yum:import-rpmdb:validate:update:diff:install:init:download" -- $1))
     2.7 -}
     2.8 -
     2.9 -__razor_packages () {
    2.10 -    local IFS=$'\n'
    2.11 -
    2.12 -    COMPREPLY=($(razor list --only-names "$1*" | while read p; do echo "$p "; done))
    2.13 -}
    2.14 -
    2.15 -__razor_upstream_packages () {
    2.16 -    local IFS=$'\n'
    2.17 -
    2.18 -    COMPREPLY=($(RAZOR_REPO=rawhide.repo razor list --only-names "$1*" | while read p; do echo "$p "; done))
    2.19 -}
    2.20 -
    2.21 -__razor_files() {
    2.22 -    COMPREPLY=($(razor list-files "$1*"))
    2.23 -}
    2.24 -
    2.25 -__razor_requires() {
    2.26 -    COMPREPLY=($(compgen -W "$(razor list-requires)" -- $1))
    2.27 -}
    2.28 -
    2.29 -__razor_provides() {
    2.30 -    COMPREPLY=($(compgen -W "$(razor list-provides)" -- $1))
    2.31 -}
    2.32 -
    2.33 -__razor() {
    2.34 -    local cur="${COMP_WORDS[COMP_CWORD]}"
    2.35 -
    2.36 -    if [ $COMP_CWORD = 1 ]; then
    2.37 -	__razor_commands $cur
    2.38 -    else
    2.39 -	case "${COMP_WORDS[1]}" in
    2.40 -	    info|list-requires|list-provides|list-package-files)
    2.41 -		__razor_packages $cur ;;
    2.42 -	    list-files|list-file-packages) __razor_files $cur ;;
    2.43 -	    what-requires) __razor_requires $cur ;;
    2.44 -	    what-provides) __razor_provides $cur ;;
    2.45 -	    install|download) __razor_upstream_packages $cur ;;
    2.46 -	esac
    2.47 -    fi
    2.48 -}
    2.49 -
    2.50 -complete -o nospace -F __razor razor

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/data/razor.sh	Mon Jun 23 10:31:04 2008 -0400
     3.3 @@ -0,0 +1,47 @@
     3.4 +__razor_commands () {
     3.5 +    local IFS=$'\n'
     3.6 +    COMPREPLY=($(IFS=: compgen -S' ' -W "info:list-requires:list-provides:list-files:list-file-packages:list-package-files:what-requires:what-provides:import-yum:import-rpmdb:validate:update:diff:install:init:download" -- $1))
     3.7 +}
     3.8 +
     3.9 +__razor_packages () {
    3.10 +    local IFS=$'\n'
    3.11 +
    3.12 +    COMPREPLY=($(razor list --only-names "$1*" | while read p; do echo "$p "; done))
    3.13 +}
    3.14 +
    3.15 +__razor_upstream_packages () {
    3.16 +    local IFS=$'\n'
    3.17 +
    3.18 +    COMPREPLY=($(RAZOR_REPO=rawhide.repo razor list --only-names "$1*" | while read p; do echo "$p "; done))
    3.19 +}
    3.20 +
    3.21 +__razor_files() {
    3.22 +    COMPREPLY=($(razor list-files "$1*"))
    3.23 +}
    3.24 +
    3.25 +__razor_requires() {
    3.26 +    COMPREPLY=($(compgen -W "$(razor list-requires)" -- $1))
    3.27 +}
    3.28 +
    3.29 +__razor_provides() {
    3.30 +    COMPREPLY=($(compgen -W "$(razor list-provides)" -- $1))
    3.31 +}
    3.32 +
    3.33 +__razor() {
    3.34 +    local cur="${COMP_WORDS[COMP_CWORD]}"
    3.35 +
    3.36 +    if [ $COMP_CWORD = 1 ]; then
    3.37 +	__razor_commands $cur
    3.38 +    else
    3.39 +	case "${COMP_WORDS[1]}" in
    3.40 +	    info|list-requires|list-provides|list-package-files)
    3.41 +		__razor_packages $cur ;;
    3.42 +	    list-files|list-file-packages) __razor_files $cur ;;
    3.43 +	    what-requires) __razor_requires $cur ;;
    3.44 +	    what-provides) __razor_provides $cur ;;
    3.45 +	    install|download) __razor_upstream_packages $cur ;;
    3.46 +	esac
    3.47 +    fi
    3.48 +}
    3.49 +
    3.50 +complete -o nospace -F __razor razor