moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-23 08:18:51 -05:00
Code Issues Releases Wiki Activity

bash_completion: use absolute paths to utilities

Browse Source 
Fixes issues noted in FS#16630.

Signed-off-by: Dan McGee <dan@archlinux.org>
(cherry picked from commit 03f35b1432)

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2009-11-30 22:56:44 -06:00
parent ce9bb994f8
commit 8b3f5f0ce6
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
contrib/bash_completion
View File

@ -14,7 +14,7 @@ rem_selected ()
# (Adapted from bash_completion by Ian Macdonald <ian@caliban.org>) # (Adapted from bash_completion by Ian Macdonald <ian@caliban.org>)
# This removes any options from the list of completions that have # This removes any options from the list of completions that have
# already been specified on the command line. # already been specified on the command line.
COMPREPLY=($(echo "${COMP_WORDS[@]}" | \ COMPREPLY=($(/bin/echo "${COMP_WORDS[@]}" | \
(while read -d ' ' i; do (while read -d ' ' i; do
[ "${i}" == "" ] && continue [ "${i}" == "" ] && continue
# flatten array with spaces on either side, # flatten array with spaces on either side,
@ -24,20 +24,20 @@ rem_selected ()
# remove word from list of completions # remove word from list of completions
COMPREPLY=(${COMPREPLY/ ${i%% *} / }) COMPREPLY=(${COMPREPLY/ ${i%% *} / })
done done
echo ${COMPREPLY[@]}))) /bin/echo ${COMPREPLY[@]})))
return 0 return 0
} }
_available_repos () _available_repos ()
{ {
COMPREPLY=( $( compgen -W "$(grep '\[' /etc/pacman.conf | grep -v -e 'options' -e '^#' | tr -d '[]' )" -- $cur ) ) COMPREPLY=( $( compgen -W "$(/bin/grep '\[' /etc/pacman.conf | /bin/grep -v -e 'options' -e '^#' | tr -d '[]' )" -- $cur ) )
} }
_installed_pkgs () _installed_pkgs ()
{ {
local installed_pkgs local installed_pkgs
installed_pkgs=$( ls /var/lib/pacman/local/ ) installed_pkgs=$( /bin/ls /var/lib/pacman/local/ )
COMPREPLY=( $( compgen -W "$( for i in $installed_pkgs; do echo ${i%-*-*}; done )" -- $cur ) ) COMPREPLY=( $( compgen -W "$( for i in $installed_pkgs; do /bin/echo ${i%-*-*}; done )" -- $cur ) )
} }
_available_pkgs () _available_pkgs ()
@ -47,16 +47,16 @@ _available_pkgs ()
# This little change-up removes the find *and* only uses enabled repos # This little change-up removes the find *and* only uses enabled repos
local available_pkgs local available_pkgs
local enabled_repos local enabled_repos
enabled_repos=$( grep '\[' /etc/pacman.conf | grep -v -e 'options' -e '^#' | tr -d '[]' ) enabled_repos=$( /bin/grep '\[' /etc/pacman.conf | /bin/grep -v -e 'options' -e '^#' | tr -d '[]' )
available_pkgs=$( for r in $enabled_repos; do echo /var/lib/pacman/sync/$r/*; done ) available_pkgs=$( for r in $enabled_repos; do /bin/echo /var/lib/pacman/sync/$r/*; done )
COMPREPLY=( $( compgen -W "$( for i in $available_pkgs; do j=${i##*/}; echo ${j%-*-*}; done )" -- $cur ) ) COMPREPLY=( $( compgen -W "$( for i in $available_pkgs; do j=${i##*/}; echo ${j%-*-*}; done )" -- $cur ) )
} }
_installed_groups () _installed_groups ()
{ {
local installed_groups local installed_groups
installed_groups=$( find /var/lib/pacman/local -name desc -exec sed -ne '/%GROUPS%/,/^$/{//d; p}' {} \; | sort -u ) installed_groups=$( /bin/find /var/lib/pacman/local -name desc -exec /bin/sed -ne '/%GROUPS%/,/^$/{//d; p}' {} \; | /bin/sort -u )
COMPREPLY=( $( compgen -W "$( for i in $installed_groups; do echo ${i%-*-*}; done )" -- $cur ) ) COMPREPLY=( $( compgen -W "$( for i in $installed_groups; do /bin/echo ${i%-*-*}; done )" -- $cur ) )
} }
_available_groups () _available_groups ()
@ -66,9 +66,9 @@ _available_groups ()
# This little change-up removes the find *and* only uses enabled repos # This little change-up removes the find *and* only uses enabled repos
local available_groups local available_groups
local enabled_repos local enabled_repos
enabled_repos=$( grep '\[' /etc/pacman.conf | grep -v -e 'options' -e '^#' | tr -d '[]' ) enabled_repos=$( /bin/grep '\[' /etc/pacman.conf | /bin/grep -v -e 'options' -e '^#' | tr -d '[]' )
available_groups=$( for r in $enabled_repos; do sed '/%GROUPS%/,/^$/{//d; p}' /var/lib/pacman/sync/$r/*/desc | sort -u; done ) available_groups=$( for r in $enabled_repos; do /bin/sed '/%GROUPS%/,/^$/{//d; p}' /var/lib/pacman/sync/$r/*/desc | /bin/sort -u; done )
COMPREPLY=( $( compgen -W "$( for i in $available_groups; do echo ${i%-*-*}; done )" -- $cur ) ) COMPREPLY=( $( compgen -W "$( for i in $available_groups; do /bin/echo ${i%-*-*}; done )" -- $cur ) )
} }
## makepkg completion ## makepkg completion
@ -126,7 +126,7 @@ _instring ()
str="${1}" str="${1}"
shift 1 shift 1
for c in "${@}"; do for c in "${@}"; do
if [ $(expr index "${str}" "${c}") -gt 0 ]; then if [ $(/bin/expr index "${str}" "${c}") -gt 0 ]; then
return 0 return 0
fi fi
done done
@ -193,7 +193,7 @@ _pacman ()
esac esac
arglen=$(( ${#toparse}-1 )) arglen=$(( ${#toparse}-1 ))
for c in $(seq 0 "${arglen}"); do for c in $(/bin/seq 0 "${arglen}"); do
arg=${toparse:$c:1} arg=${toparse:$c:1}
[ "${arg}" != "-" ] && mod="${mod}${arg}" [ "${arg}" != "-" ] && mod="${mod}${arg}"
done done