[arch-commits] Commit in bash-completion/trunk (PKGBUILD archlinux bash_completion.sh)
Aaron Griffin
aaron at archlinux.org
Tue Sep 22 18:31:33 UTC 2009
Date: Tuesday, September 22, 2009 @ 14:31:32
Author: aaron
Revision: 52863
upgpkg: bash-completion 1.0-3
Remove profile.d script for bash_completion
Rebuild as -any package
Modified:
bash-completion/trunk/PKGBUILD
Deleted:
bash-completion/trunk/archlinux
bash-completion/trunk/bash_completion.sh
--------------------+
PKGBUILD | 9 -
archlinux | 347 ---------------------------------------------------
bash_completion.sh | 12 -
3 files changed, 2 insertions(+), 366 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-09-22 17:08:31 UTC (rev 52862)
+++ PKGBUILD 2009-09-22 18:31:32 UTC (rev 52863)
@@ -5,19 +5,16 @@
pkgname=bash-completion
pkgver=1.0
-pkgrel=2
+pkgrel=3
pkgdesc="Programmable completion for the bash shell"
-arch=(i686 x86_64)
+arch=(any)
url="http://bash-completion.alioth.debian.org/"
license=('GPL')
depends=('bash')
source=(http://bash-completion.alioth.debian.org/files/$pkgname-$pkgver.tar.gz
- bash_completion.sh
fix-_filedir-on-bash-4.patch)
md5sums=('cd1c5648272917fbe0eef4ba30bb93f4'
- 'b02622e759e01b2077617ddfc51cbe43'
'1c707436109fb4c80ef7abeefc7dd1b0')
-options=('force')
build() {
cd "$srcdir/$pkgname-$pkgver"
@@ -33,7 +30,5 @@
# apache2ctl doesn't work, even when renamed to apachectl (and sed'd)
rm "$pkgdir/etc/bash_completion.d/apache2ctl"
-
- install -Dm755 "$srcdir/bash_completion.sh" "$pkgdir/etc/profile.d/bash_completion.sh"
}
# vim:set ts=2 sw=2 et:
Deleted: archlinux
===================================================================
--- archlinux 2009-09-22 17:08:31 UTC (rev 52862)
+++ archlinux 2009-09-22 18:31:32 UTC (rev 52863)
@@ -1,347 +0,0 @@
-# vim: set ft=sh:
-# Bash completion for ArchLinux
-#
-# v.1.1 Manolis Tzanidakis <mtzanidakis at freemail.gr>
-#
-# Distributed under the terms of the GNU General Public License, v2 or later.
-#
-
-## Changelog ####################################################
-# #
-# * 1.1 (20040117) #
-# - Code cleanup #
-# - Updated to pacman 2.7.2-2 #
-# * 20040216 (orelien) #
-# - Improved available_{pkgs,groups) functions #
-# - Added support for querying groups #
-# #
-#################################################################
-
-## initial functions
-#
-
-rem_selected ()
-{
- # (Adapted from bash_completion by Ian Macdonald <ian at caliban.org>)
- # This removes any options from the list of completions that have
- # already been specified on the command line.
- COMPREPLY=($(echo "${COMP_WORDS[@]}" | \
- (while read -d ' ' i; do
- [ "${i}" == "" ] && continue
- # flatten array with spaces on either side,
- # otherwise we cannot grep on word boundaries of
- # first and last word
- COMPREPLY=" ${COMPREPLY[@]} "
- # remove word from list of completions
- COMPREPLY=(${COMPREPLY/ ${i%% *} / })
- done
- echo ${COMPREPLY[@]})))
- return 0
-}
-
-_available_repos ()
-{
- COMPREPLY=( $( compgen -W "$(grep '\[' /etc/pacman.conf | grep -v -e 'options' -e '^#' | tr -d '[]' )" -- $cur ) )
-}
-
-_installed_pkgs ()
-{
- local installed_pkgs
- installed_pkgs=$( ls /var/lib/pacman/local/ )
- COMPREPLY=( $( compgen -W "$( for i in $installed_pkgs; do echo ${i%-*-*}; done )" -- $cur ) )
-}
-
-_available_pkgs ()
-{
- #find balks easilly on a find /foo/*/* type dir, especially one like
- # /var/lib/pacman/*/*
- # This little change-up removes the find *and* only uses enabled repos
- local available_pkgs
- local enabled_repos
- enabled_repos=$( grep '\[' /etc/pacman.conf | grep -v -e 'options' -e '^#' | tr -d '[]' )
- available_pkgs=$( for r in $enabled_repos; do echo /var/lib/pacman/$r/*; done )
- COMPREPLY=( $( compgen -W "$( for i in $available_pkgs; do j=${i##*/}; echo ${j%-*-*}; done )" -- $cur ) )
-}
-
-_installed_groups ()
-{
- local installed_groups
- installed_groups=$( find /var/lib/pacman/local -name desc -exec sed -ne '/%GROUPS%/,/^$/{//d; p}' {} \; | sort -u )
- COMPREPLY=( $( compgen -W "$( for i in $installed_groups; do echo ${i%-*-*}; done )" -- $cur ) )
-}
-
-_available_groups ()
-{
- #find balks easilly on a find /foo/*/* type dir, especially one like
- # /var/lib/pacman/*/*
- # This little change-up removes the find *and* only uses enabled repos
- local available_groups
- local enabled_repos
- enabled_repos=$( grep '\[' /etc/pacman.conf | grep -v -e 'options' -e '^#' | tr -d '[]' )
- available_groups=$( for r in $enabled_repos; do sed '/%GROUPS%/,/^$/{//d; p}' /var/lib/pacman/$r/*/desc | sort -u; done )
- COMPREPLY=( $( compgen -W "$( for i in $available_groups; do echo ${i%-*-*}; done )" -- $cur ) )
-}
-
-## init (/etc/rc.d) script completion (quick 'n' dirty ;-)
-#
-
-complete -W "start stop restart" \
- $(for i in /etc/rc.d/*; do echo ${i##*/}; done)
-
-## makepkg completion
-#
-
-_makepkg ()
-{
- local cur prev
- COMPREPLY=()
- cur=${COMP_WORDS[COMP_CWORD]}
- prev=${COMP_WORDS[COMP_CWORD-1]}
-
- case "$prev" in
- -@(p|w))
- _filedir
- return 0
- ;;
- --help|--cleancache|--genmd5)
- COMPREPLY=''
- return 0
- ;;
- esac
-
- if [[ "$cur" == -* ]]; then
- COMPREPLY=( $( compgen -W '-b --builddeps \
- -c --clean \
- -C --cleancache \
- -d --nodeps \
- -f --force \
- -g --genmd5 \
- -h --help \
- -i --install \
- -m --nocolor \
- -n --nostrip \
- -r --rmdeps \
- -s --syncdeps \
- -p -w' -- $cur ) )
- fi
-
- rem_selected
-}
-complete -o default -F _makepkg makepkg
-
-## pacman completion
-#
-
-_instring ()
-{
- str="${1}"
- shift 1
- for c in "${@}"; do
- if [ $(expr index "${str}" "${c}") -gt 0 ]; then
- return 0
- fi
- done
- return 1
-}
-
-_pacman ()
-{
- local a arg toparse op mod cur
- COMPREPLY=()
-
- # This argument parsing is done so we can check for flag existance later
- # right now it's a tad crappy, but does the job
- for (( i=1; i < ${#COMP_WORDS[@]}-1; i++ )); do
- a=${COMP_WORDS[i]}
- arg="${a:0:2}"
- toparse="${a:2}"
-
- case "${arg}" in
- -@(A|U|F|R|S|Q|h|V))
- op="${arg/-}"
- mod="${mod}${a:2}"
- ;;
- --)
- arg="${a:2}"
- case "${arg}" in
- add) op="A" ;;
- remove) op="R" ;;
- upgrade) op="U" ;;
- freshen) op="F" ;;
- query) op="Q" ;;
- sync) op="S" ;;
- help) op="h" ;;
- version) op="V" ;;
- verbose) mod="${mod}v" ;;
- root) mod="${mod}r" ;;
- dbpath) mod="${mod}b" ;;
- nodeps) mod="${mod}d" ;;
- force) mod="${mod}f" ;;
- groups) mod="${mod}g" ;;
- info) mod="${mod}i" ;;
- list) mod="${mod}l" ;;
- print-uris) mod="${mod}p" ;;
- search) mod="${mod}s" ;;
- sysupgrade) mod="${mod}u" ;;
- downloadonly) mod="${mod}w" ;;
- refresh) mod="${mod}y" ;;
- orphans) mod="${mod}e" ;;
- foreign) mod="${mod}m" ;;
- owns) mod="${mod}o" ;;
- file) mod="${mod}p" ;;
- search) mod="${mod}s" ;;
- cascade) mod="${mod}c" ;;
- nodeps) mod="${mod}d" ;;
- dbonly) mod="${mod}k" ;;
- nosave) mod="${mod}n" ;;
- recursive) mod="${mod}s" ;;
- esac ;;
- *) toparse="${a}" ;;
- esac
-
- arglen=$(( ${#toparse}-1 ))
- for c in $(seq 0 "${arglen}"); do
- arg=${toparse:$c:1}
- [ "${arg}" != "-" ] && mod="${mod}${arg}"
- done
- done
-
- cur=${COMP_WORDS[COMP_CWORD]}
-
- if [ $COMP_CWORD -eq 1 ] && [[ "$cur" == -* ]]; then
- COMPREPLY=( $( compgen -W '\
- -A --add \
- -F --freshen \
- -h --help \
- -Q --query \
- -R --remove \
- -S --sync \
- -U --upgrade \
- -V --version \
- ' -- $cur ) )
- rem_selected
- return 0
- fi
-
- if [[ "$cur" == -* ]]; then
- case "${op}" in
- A|U|F)
- COMPREPLY=( $( compgen -W '\
- -d --nodeps \
- -f --force \
- -h --help \
- --config \
- --noconfirm \
- --noprogressbar \
- -v --verbose \
- -r --root \
- -b --dbpath \
- ' -- $cur ) )
- return 0
- ;;
- R)
- COMPREPLY=( $( compgen -W '\
- -c --cascade \
- -d --nodeps \
- -f --force \
- -h --help \
- -k --dbonly \
- -n --nosave \
- -s --recursive \
- --config \
- --noconfirm \
- --noprogressbar \
- -v --verbose \
- -r --root \
- -b --dbpath \
- ' -- $cur ) )
- return 0
- ;;
- S)
- COMPREPLY=( $( compgen -W '\
- -c --clean \
- -d --nodeps \
- -f --force \
- -g --groups \
- -h --help \
- -i --info \
- -l --list \
- -p --print-uris \
- -s --search \
- -u --sysupgrade \
- -w --downloadonly \
- -y --refresh \
- --config \
- --noconfirm \
- --noprogressbar \
- -v --verbose \
- -r --root \
- -b --dbpath \
- ' -- $cur ) )
- return 0
- ;;
- Q)
- COMPREPLY=( $( compgen -W '\
- -e --orphans \
- -g --groups \
- -h --help \
- -i --info \
- -l --list \
- -m --foreign \
- -o --owns \
- -p --file \
- -s --search \
- --config \
- --noconfirm \
- --noprogressbar \
- -v --verbose \
- -r --root \
- -b --dbpath \
- ' -- $cur ) )
- return 0
- ;;
- esac
- rem_selected
- else
- case "${op}" in
- A|U)
- COMPREPLY=( $( compgen -d -- "$cur" ) \
- $( compgen -f -X '!*.pkg.tar.gz' -- "$cur" ) )
- return 0
- ;;
- h|V)
- COMPREPLY=''
- return 0
- ;;
- Q)
- if _instring $mod g; then
- _installed_groups
- elif _instring $mod o; then
- COMPREPLY=( $( compgen -d -- "$cur" ) \
- $( compgen -f -- "$cur" ) )
- elif _instring $mod p; then
- COMPREPLY=( $( compgen -d -- "$cur" ) \
- $( compgen -f -X '!*.pkg.tar.gz' -- "$cur" ) )
- else
- _installed_pkgs
- fi
- return 0
- ;;
- R)
- _installed_pkgs
- return 0
- ;;
- S)
- if _instring $mod l; then
- _available_repos
- else
- _available_pkgs
- fi
- return 0
- ;;
- esac
- fi
-
- rem_selected
-}
-complete -o filenames -F _pacman pacman
Deleted: bash_completion.sh
===================================================================
--- bash_completion.sh 2009-09-22 17:08:31 UTC (rev 52862)
+++ bash_completion.sh 2009-09-22 18:31:32 UTC (rev 52863)
@@ -1,12 +0,0 @@
-#!/bin/bash
-# Check for bash (and that we haven't already been sourced).
-[ -z "$BASH_VERSION" -o -n "$BASH_COMPLETION" ] && return
-
-# Check for interactive shell.
-if shopt -q login_shell; then
- if [ -r /etc/bash_completion ]; then
- # Source completion code.
- . /etc/bash_completion
- fi
-fi
-
More information about the arch-commits
mailing list