diff -uNbr bash_completion/bash-completion.sh bash_completion-new/bash-completion.sh --- bash_completion/bash-completion.sh Wed Dec 31 19:00:00 1969 +++ bash_completion-new/bash-completion.sh Sun Feb 16 17:32:17 2003 @@ -0,0 +1,14 @@ +#!/bin/sh + +if test ${SHELL#*bin/} = "bash"; then + bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.} + if [ "$PS1" ] && [ $bmajor -eq 2 ] && [ $bminor '>' 04 ] \ + && [ -f @PREFIX@/etc/bash_completion ]; then # interactive shell + # Source completion code + . @PREFIX@/etc/bash_completion + fi + if [ -f @PREFIX@/share/init/bash/completions ]; then + . @PREFIX@/share/init/bash/completions + fi + unset bash bmajor bminor +fi diff -uNbr bash_completion/bash_completion bash_completion-new/bash_completion --- bash_completion/bash_completion Sun Feb 9 04:14:09 2003 +++ bash_completion-new/bash_completion Sun Feb 16 17:33:02 2003 @@ -24,8 +24,8 @@ # Alter the following to reflect the location of this file # -declare -r BASH_COMPLETION=${BASH_COMPLETION:-/etc/bash_completion} 2>/dev/null -declare -r BASH_COMPLETION_DIR=${BASH_COMPLETION_DIR:=/etc/bash_completion.d} 2>/dev/null +declare -r BASH_COMPLETION=${BASH_COMPLETION:-@PREFIX@/etc/bash_completion} 2>/dev/null +declare -r BASH_COMPLETION_DIR=${BASH_COMPLETION_DIR:=@PREFIX@/etc/bash_completion.d} 2>/dev/null # Set a couple of useful vars # @@ -1217,12 +1217,12 @@ { local i - if [ -r /var/log/rpmpkgs -a \ - /var/log/rpmpkgs -nt /var/lib/rpm/Packages ]; then + if [ -r @PREFIX@/var/log/rpmpkgs -a \ + @PREFIX@/var/log/rpmpkgs -nt @PREFIX@/var/lib/rpm/Packages ]; then # using RHL 7.2 - this is quicker than querying the DB COMPREPLY=( $( sed -ne \ 's|^\('$cur'.*\)-[0-9a-zA-Z._]\+-[0-9a-z.@]\+.*\.rpm$|\1|p' \ - /var/log/rpmpkgs ) ) + @PREFIX@/var/log/rpmpkgs ) ) else COMPREPLY=( $( rpm -qa | sed -ne \ 's|^\('$cur'.*\)-[0-9a-zA-Z._]\+-[0-9a-z.@]\+$|\1|p' ) ) @@ -1614,7 +1614,7 @@ have aptitude && { _comp-dpkg-hold-packages() { - grep -B 2 'hold' /var/lib/dpkg/status | grep "Package: $1" \ + grep -B 2 'hold' @PREFIX@/var/lib/dpkg/status | grep "Package: $1" \ | cut -d\ -f2 } @@ -2994,7 +2994,7 @@ have dpkg && { _comp-dpkg-installed-packages() { - grep -B 2 'ok installed' /var/lib/dpkg/status | grep "Package: $1" | \ + grep -B 2 'ok installed' @PREFIX@/var/lib/dpkg/status | grep "Package: $1" | \ cut -d\ -f2 } @@ -3467,7 +3467,7 @@ # first try new urpmq option to get package list packages=$( urpmq --media $media --list 2>/dev/null ) # default to old manual database extraction - [ -z "$packages" ] && packages=$( gzip -dc /var/lib/urpmi/synthesis.hdlist.$media* | awk -F'@' '/info/ {print $1}' ) + [ -z "$packages" ] && packages=$( gzip -dc @PREFIX@/var/lib/urpmi/synthesis.hdlist.$media* | awk -F'@' '/info/ {print $1}' ) # return list of available packages COMPREPLY=( $( echo $packages | tr " " "\n" | grep "^$cur" ) ) } @@ -3796,9 +3796,9 @@ local admindir # find wich admin dir to use if [ -f /etc/debian_version ]; then - admindir=/var/lib/dpkg/alternatives + admindir=@PREFIX@/var/lib/dpkg/alternatives else - admindir=/var/lib/rpm/alternatives + admindir=@PREFIX@/var/lib/rpm/alternatives fi for (( i=1; i < COMP_CWORD; i++ )); do if [[ "${COMP_WORDS[i]}" == --admindir ]]; then @@ -4168,7 +4168,7 @@ { local cur pkgdir prev - pkgdir=${PKG_DBDIR:-/var/db/pkg/} + pkgdir=${PKG_DBDIR:-@PREFIX@/var/db/pkg/} cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} @@ -4214,7 +4214,7 @@ { local cur pkgdir prev - pkgdir=${PKG_DBDIR:-/var/db/pkg/} + pkgdir=${PKG_DBDIR:-@PREFIX@/var/db/pkg/} cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} @@ -4238,7 +4238,7 @@ COMPREPLY=() cur=${COMP_WORDS[COMP_CWORD]} - COMPREPLY=( $( (cd /var/log/packages; compgen -f -- "$cur") ) ) + COMPREPLY=( $( (cd @PREFIX@/var/log/packages; compgen -f -- "$cur") ) ) } [ -n "${have:-}" ] && complete -F _removepkg $filenames removepkg && complete $dirnames -f -X '!*.tgz' installpkg upgradepkg explodepkg