diff --git a/.cvsignore b/.cvsignore index 9228f76..b4138f1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ -bash-completion-1.0.tar.gz +bash-completion-1.1.tar.bz2 +CHANGES-1.1 diff --git a/bash-completion-1.0-bash4quoting-490322.patch b/bash-completion-1.0-bash4quoting-490322.patch deleted file mode 100644 index 79acef3..0000000 --- a/bash-completion-1.0-bash4quoting-490322.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Mike Kelly -Date: Thu, 2 Apr 2009 15:16:46 +0000 (-0400) -Subject: Fix _filedir on bash 4. -X-Git-Url: http://git.debian.org/?p=bash-completion%2Fbash-completion.git;a=commitdiff_plain;h=1421e55aac075e13491cd212b796bdd453214a2c - -Fix _filedir on bash 4. - -We don't need to double-quote things for compgen w/ bash 4. Just putting -each file in double quotes is sufficient. - -See: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00155.html ---- - -diff --git a/bash_completion b/bash_completion -index 0246cd8..4d21cf8 100644 ---- a/bash_completion -+++ b/bash_completion -@@ -209,6 +209,12 @@ quote() - # results in the original argument - quote_readline() - { -+ if [[ "${BASH_VERSINFO[0]}" -ge 4 ]] ; then -+ # This function isn't really necessary on bash 4 -+ # See: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00155.html -+ echo "${1}" -+ return -+ fi - local t="${1//\\/\\\\}" - echo \'${t//\'/\'\\\'\'}\' #'# Help vim syntax highlighting - } diff --git a/bash-completion-mock b/bash-completion-mock deleted file mode 100644 index eabdeb7..0000000 --- a/bash-completion-mock +++ /dev/null @@ -1,79 +0,0 @@ -# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*- -# ex: ts=8 sw=8 noet filetype=sh -# -# bash completion for mock - -_mock() -{ - local cur prev plugins cfgdir - - COMPREPLY=() - cur=`_get_cword` - prev=${COMP_WORDS[COMP_CWORD-1]} - plugins='tmpfs root_cache yum_cache bind_mount ccache' - cfgdir=/etc/mock - - count=0 - for i in "${COMP_WORDS[@]}" ; do - [ $count -eq $COMP_CWORD ] && break - if [[ "$i" == --configdir ]] ; then - cfgdir="${COMP_WORDS[((count+1))]}" - elif [[ "$i" == --configdir=* ]] ; then - cfgdir=${i/*=/} - fi - count=$((++count)) - done - - # --name=value style option - if [[ "$cur" == --?*=* ]] ; then - prev="${cur/=*}" - cur="${cur#$prev=}" - fi - - case $prev in - -@(h|-help|-copy@(in|out)|-arch|D|-define|-with?(out)|-uniqueext|-rpmbuild_timeout|-sources|-cwd)) - return 0 - ;; - -@(r|-root)) - COMPREPLY=( $( command ls $cfgdir | \ - sed -ne 's/^\('$cur'.*\)\.cfg$/\1/p') ) - return 0 - ;; - --@(config|result)dir) - _filedir -d - return 0 - ;; - --spec) - _filedir spec - return 0 - ;; - --target) - # Yep, compatible archs, not compatible build archs - # (e.g. ix86 chroot builds in x86_64 mock host) - # This would actually depend on what the target root - # can be used to build for... - COMPREPLY=( $( compgen -W "$( command rpm --showrc | sed -ne 's/^\s*compatible\s\+archs\s*:\s*\(.*\)/\1/i p' )" -- $cur ) ) - return 0 - ;; - --@(en|dis)able-plugin) - COMPREPLY=( $( compgen -W "$plugins" -- $cur ) ) - return 0 - ;; - esac - - if [[ "$cur" == -* ]] ; then - COMPREPLY=( $( compgen -W '--version -h --help --rebuild \ - --buildsrpm --shell --chroot --clean --init \ - --installdeps --install --update --orphanskill \ - --copyin --copyout -r --root --offline --no-clean \ - --cleanup-after --no-cleanup-after --arch --target \ - -D --define --with --without --resultdir --uniqueext \ - --configdir --rpmbuild_timeout --unpriv --cwd --spec \ - --sources -v --verbose -q --quiet --trace \ - --enable-plugin --disable-plugin --print-root-path' \ - -- $cur ) ) - else - _filedir '?(no)src.rpm' - fi -} -complete -F _mock $filenames mock diff --git a/bash-completion-repomanage b/bash-completion-repomanage deleted file mode 100644 index d932496..0000000 --- a/bash-completion-repomanage +++ /dev/null @@ -1,24 +0,0 @@ -# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*- -# ex: ts=8 sw=8 noet filetype=sh -# -# bash completion for repomanage - -have repomanage && -_repomanage() -{ - local cur prev - - COMPREPLY=() - cur=`_get_cword` - prev=${COMP_WORDS[COMP_CWORD-1]} - - [[ "$prev" == -@(h|-help|k|-keep) ]] && return 0 - - if [[ "$cur" == -* ]] ; then - COMPREPLY=( $( compgen -W '-o --old -n --new -s --space -k \ - --keep -c --nocheck -h --help' -- $cur ) ) - else - _filedir -d - fi -} && -complete -F _repomanage $filenames repomanage diff --git a/bash-completion.spec b/bash-completion.spec index 99c7ea8..1868dfc 100644 --- a/bash-completion.spec +++ b/bash-completion.spec @@ -1,18 +1,18 @@ Name: bash-completion -Version: 1.0 -Release: 5%{?dist} +Version: 1.1 +Release: 3%{?dist} Epoch: 1 Summary: Programmable completion for Bash Group: System Environment/Shells License: GPLv2+ URL: http://bash-completion.alioth.debian.org/ -Source0: http://bash-completion.alioth.debian.org/files/%{name}-%{version}.tar.gz -Source1: %{name}-mock -Source2: %{name}-plague-client -Source3: %{name}-repomanage -# http://git.debian.org/?p=bash-completion/bash-completion.git;a=commitdiff;h=1421e55aac075e13491cd212b796bdd453214a2c -Patch0: %{name}-1.0-bash4quoting-490322.patch +Source0: http://bash-completion.alioth.debian.org/files/%{name}-%{version}.tar.bz2 +Source1: %{name}-plague-client +# Sources 2 and 3 missing from upstream 1.1 tarball. +Source2: http://bash-completion.alioth.debian.org/files/CHANGES-1.1 +# http://git.debian.org/?p=bash-completion/bash-completion.git;a=blob_plain;f=bash_completion.sh;h=915960b614ef7644f9abaa99ed9ef0faa7ac5477;hb=HEAD +Source3: bash_completion.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -27,11 +27,40 @@ of the programmable completion feature of bash 2. %prep %setup -q -%patch0 -p1 -install -pm 644 %{SOURCE1} contrib/mock -install -pm 644 %{SOURCE2} contrib/plague-client -install -pm 644 %{SOURCE3} contrib/repomanage -rm contrib/cowsay # cowsay ships an updated one +install -pm 644 %{SOURCE1} contrib/plague-client +install -pm 644 %{SOURCE2} CHANGES +install -pm 644 %{SOURCE3} bash_completion.sh + +# Updated completions shipped upstream: +rm contrib/cowsay +# subversion too, but only in >= 1.6.5-2 +# yum-utils (repomanage) too, but only in >= 1.1.24 +# yum planned to be upstreamed soon (probably >= 3.2.26) + +# Combine to per-package files: +( echo ; cat contrib/update-alternatives ) >> contrib/chkconfig +rm contrib/update-alternatives + +# Not applicable to Fedora and derivatives: +rm contrib/apache2ctl +rm contrib/apt-build +rm contrib/aptitude +rm contrib/cardctl +rm contrib/dpkg +rm contrib/dselect +rm contrib/heimdal +rm contrib/kldload +rm contrib/lilo +rm contrib/links +rm contrib/pkg_install +rm contrib/pkgtools +rm contrib/portupgrade +rm contrib/reportbug +rm contrib/sysv-rc + +# Not handled due to other reasons (e.g. no known packages) (yet?): +rm contrib/larch +rm contrib/p4 %build @@ -39,16 +68,28 @@ rm contrib/cowsay # cowsay ships an updated one %install rm -rf $RPM_BUILD_ROOT %{name}-ghosts.list + install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d install -pm 644 bash_completion $RPM_BUILD_ROOT%{_sysconfdir} install -pm 644 bash_completion.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d + install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name} install -pm 644 contrib/* $RPM_BUILD_ROOT%{_datadir}/%{name} + install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d -cd contrib + +# Always installed (not triggered) completions for practically always +# installed packages or non-triggerable common ones: +for f in bash-builtins configure dd getent iconv rpm ; do + mv $RPM_BUILD_ROOT{%{_datadir}/%{name}/$f,%{_sysconfdir}/bash_completion.d} +done + +d=$(pwd) +# ghost list +cd $RPM_BUILD_ROOT%{_datadir}/%{name} for f in * ; do - ln -s %{_datadir}/%{name}/$f $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d - echo "%ghost %{_sysconfdir}/bash_completion.d/$f" >> ../%{name}-ghosts.list + ln -s %{_datadir}/%{name}/$f $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d + echo "%ghost %{_sysconfdir}/bash_completion.d/$f" >> $d/%{name}-ghosts.list done cd - @@ -57,171 +98,123 @@ cd - rm -rf $RPM_BUILD_ROOT -%define do_triggerin() if [ ! -e %{_sysconfdir}/bash_completion.d/%1 ] ; then ln -s %{_datadir}/%{name}/%1 %{_sysconfdir}/bash_completion.d || : ; fi -%define do_triggerun() [ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/%1 || : - -# Not handled (yet?): -# apache2ctl, bitkeeper, harbour, larch, lisp, p4, povray - -%triggerin -- bittorrent -%do_triggerin bittorrent -%triggerun -- bittorrent -%do_triggerun bittorrent - -%triggerin -- bridge-utils -%do_triggerin brctl -%triggerun -- bridge-utils -%do_triggerun brctl - -%triggerin -- cksfv -%do_triggerin cksfv -%triggerun -- cksfv -%do_triggerun cksfv - -%triggerin -- clisp -%do_triggerin clisp -%triggerun -- clisp -%do_triggerun clisp - -%triggerin -- dsniff -%do_triggerin dsniff -%triggerun -- dsniff -%do_triggerun dsniff - -%triggerin -- freeciv -%do_triggerin freeciv -%triggerun -- freeciv -%do_triggerun freeciv - -%triggerin -- gcc-gnat -%do_triggerin gnatmake -%triggerun -- gcc-gnat -%do_triggerun gnatmake - -%triggerin -- gcl -%do_triggerin gcl -%triggerun -- gcl -%do_triggerun gcl - -%triggerin -- gkrellm -%do_triggerin gkrellm -%triggerun -- gkrellm -%do_triggerun gkrellm - -%triggerin -- gnupg2 -%do_triggerin gpg2 -%triggerun -- gnupg2 -%do_triggerun gpg2 - -%triggerin -- lilypond -%do_triggerin lilypond -%triggerun -- lilypond -%do_triggerun lilypond - -%triggerin -- lzma -%do_triggerin lzma -%triggerun -- lzma -%do_triggerun lzma - -%triggerin -- lzop -%do_triggerin lzop -%triggerun -- lzop -%do_triggerun lzop - -%triggerin -- mailman -%do_triggerin mailman -%triggerun -- mailman -%do_triggerun mailman - -%triggerin -- mcrypt -%do_triggerin mcrypt -%triggerun -- mcrypt -%do_triggerun mcrypt - -%triggerin -- minicom -%do_triggerin minicom -%triggerun -- minicom -%do_triggerun minicom - -%triggerin -- mock -%do_triggerin mock -%triggerun -- mock -%do_triggerun mock - -%triggerin -- monodevelop -%do_triggerin monodevelop -%triggerun -- monodevelop -%do_triggerun monodevelop - -%triggerin -- mtx -%do_triggerin mtx -%triggerun -- mtx -%do_triggerun mtx - -%triggerin -- net-tools -%do_triggerin net-tools -%triggerun -- net-tools -%do_triggerun net-tools - -%triggerin -- openssh-clients -%do_triggerin ssh -%triggerun -- openssh-clients -%do_triggerun ssh - -%triggerin -- perl-CPANPLUS -%do_triggerin cpan2dist -%triggerun -- perl-CPANPLUS -%do_triggerun cpan2dist - -%triggerin -- perl-SVK -%do_triggerin svk -%triggerun -- perl-SVK -%do_triggerun svk - -%triggerin -- plague-client -%do_triggerin plague-client -%triggerun -- plague-client -%do_triggerun plague-client - -%triggerin -- qemu -%do_triggerin qemu -%triggerun -- qemu -%do_triggerun qemu - -%triggerin -- quota -%do_triggerin quota-tools -%triggerun -- quota -%do_triggerun quota-tools - -%triggerin -- qt -%do_triggerin qdbus -%triggerun -- qt -%do_triggerun qdbus - -%triggerin -- rdesktop -%do_triggerin rdesktop -%triggerun -- rdesktop -%do_triggerun rdesktop - -%triggerin -- ruby-ri -%do_triggerin ri -%triggerun -- ruby-ri -%do_triggerun ri - -%triggerin -- sbcl -%do_triggerin sbcl -%triggerun -- sbcl -%do_triggerun sbcl - -%triggerin -- sitecopy -%do_triggerin sitecopy -%triggerun -- sitecopy -%do_triggerun sitecopy - -%triggerin -- snownews -%do_triggerin snownews -%triggerun -- snownews -%do_triggerun snownews +%global bashcomp_trigger() \ +%triggerin -- %{?2}%{!?2:%1}\ +[ -e %{_sysconfdir}/bash_completion.d/%1 ] ||\ + ln -s %{_datadir}/%{name}/%1 %{_sysconfdir}/bash_completion.d || :\ +%triggerun -- %{?2}%{!?2:%1}\ +[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/%1 || :\ +%{nil} + +%bashcomp_trigger ant +%bashcomp_trigger apt +%bashcomp_trigger aptitude +%bashcomp_trigger aspell +%bashcomp_trigger autorpm +%bashcomp_trigger bind-utils +%bashcomp_trigger bitkeeper +%bashcomp_trigger bittorrent +%bashcomp_trigger bluez-utils bluez +%bashcomp_trigger brctl bridge-utils +%bashcomp_trigger bzip2 +%bashcomp_trigger cfengine +%bashcomp_trigger chkconfig +%bashcomp_trigger chsh util-linux-ng +%bashcomp_trigger cksfv +%bashcomp_trigger clisp +%bashcomp_trigger cpan2dist perl-CPANPLUS +%bashcomp_trigger cpio +%bashcomp_trigger cups +%bashcomp_trigger cvs +%bashcomp_trigger dcop kdelibs3 +%bashcomp_trigger dhclient +%bashcomp_trigger dict dictd +%bashcomp_trigger dsniff +%bashcomp_trigger findutils +%bashcomp_trigger freeciv +%bashcomp_trigger gcc +%bashcomp_trigger gcl +%bashcomp_trigger gdb +%bashcomp_trigger genisoimage +%bashcomp_trigger gkrellm +%bashcomp_trigger gnatmake gcc-gnat +%bashcomp_trigger gpg gnupg +%bashcomp_trigger gpg2 gnupg2 +%bashcomp_trigger gzip +%bashcomp_trigger imagemagick ImageMagick +%bashcomp_trigger info +%bashcomp_trigger ipmitool +%bashcomp_trigger iptables +%bashcomp_trigger isql unixODBC +%bashcomp_trigger jar java-1.6.0-openjdk-devel +%bashcomp_trigger java java-1.6.0-openjdk +%bashcomp_trigger ldapvi +%bashcomp_trigger lftp +%bashcomp_trigger lisp cmucl +%bashcomp_trigger lvm lvm2 +%bashcomp_trigger lzma xz-lzma-compat +%bashcomp_trigger lzop +%bashcomp_trigger mailman +%bashcomp_trigger make +%bashcomp_trigger man +%bashcomp_trigger mc +%bashcomp_trigger mcrypt +%bashcomp_trigger mdadm +%bashcomp_trigger minicom +%bashcomp_trigger mkinitrd +%bashcomp_trigger mock +%bashcomp_trigger modules environment-modules +%bashcomp_trigger monodevelop +%bashcomp_trigger mplayer +%bashcomp_trigger msynctool +%bashcomp_trigger mtx +%bashcomp_trigger munin-node +%bashcomp_trigger mutt +%bashcomp_trigger mysqladmin mysql +%bashcomp_trigger ncftp +%bashcomp_trigger net-tools +%bashcomp_trigger ntpdate +%bashcomp_trigger openldap openldap-clients +%bashcomp_trigger openssl +%bashcomp_trigger perl +%bashcomp_trigger pine +%bashcomp_trigger pkg-config pkgconfig +%bashcomp_trigger plague-client +%bashcomp_trigger postfix +%bashcomp_trigger postgresql +%bashcomp_trigger povray +%bashcomp_trigger python +%bashcomp_trigger qdbus qt +%bashcomp_trigger qemu +%bashcomp_trigger quota-tools quota +%bashcomp_trigger rcs +%bashcomp_trigger rdesktop + +%triggerin -- yum-utils +if [ -e %{_sysconfdir}/bash_completion.d/yum-utils.bash ] ; then + rm -f %{_sysconfdir}/bash_completion.d/repomanage || : +elif [ ! -e %{_sysconfdir}/bash_completion.d/repomanage ] ; then + ln -s %{_datadir}/%{name}/repomanage %{_sysconfdir}/bash_completion.d || : +fi +%triggerun -- yum-utils +[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/repomanage || : + +%bashcomp_trigger resolvconf +%bashcomp_trigger rfkill +%bashcomp_trigger ri ruby-ri +%bashcomp_trigger rpcdebug nfs-utils +%bashcomp_trigger rpmcheck +%bashcomp_trigger rrdtool +%bashcomp_trigger rsync +%bashcomp_trigger samba samba-common +%bashcomp_trigger sbcl +%bashcomp_trigger screen +%bashcomp_trigger shadow shadow-utils +%bashcomp_trigger sitecopy +%bashcomp_trigger smartctl smartmontools +%bashcomp_trigger snownews +%bashcomp_trigger ssh openssh-clients +%bashcomp_trigger strace %triggerin -- subversion if [ -e %{_sysconfdir}/bash_completion.d/subversion ] ; then @@ -230,32 +223,38 @@ elif [ ! -e %{_sysconfdir}/bash_completion.d/_subversion ] ; then ln -s %{_datadir}/%{name}/_subversion %{_sysconfdir}/bash_completion.d || : fi %triggerun -- subversion -%do_triggerun _subversion - -%triggerin -- unace -%do_triggerin unace -%triggerun -- unace -%do_triggerun unace - -%triggerin -- unixODBC -%do_triggerin isql -%triggerun -- unixODBC -%do_triggerun isql - -%triggerin -- unrar -%do_triggerin unrar -%triggerun -- unrar -%do_triggerun unrar - -%triggerin -- yum-utils -%do_triggerin repomanage -%triggerun -- yum-utils -%do_triggerun repomanage +[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/_subversion || : + +%bashcomp_trigger svk perl-SVK +%bashcomp_trigger sysctl procps +%bashcomp_trigger tar +%bashcomp_trigger tcpdump +%bashcomp_trigger unace +%bashcomp_trigger unrar +%bashcomp_trigger vncviewer vnc +%bashcomp_trigger vpnc +%bashcomp_trigger wireless-tools +%bashcomp_trigger wodim +%bashcomp_trigger wvdial +%bashcomp_trigger xhost xorg-x11-server-utils +%bashcomp_trigger xm xen +%bashcomp_trigger xmllint libxml2 +%bashcomp_trigger xmlwf expat +%bashcomp_trigger xmms +%bashcomp_trigger xrandr xorg-x11-server-utils +%bashcomp_trigger xz +%bashcomp_trigger yp-tools + +%triggerin -- yum +if [ -e %{_sysconfdir}/bash_completion.d/yum.bash ] ; then + rm -f %{_sysconfdir}/bash_completion.d/_yum || : +elif [ ! -e %{_sysconfdir}/bash_completion.d/_yum ] ; then + ln -s %{_datadir}/%{name}/_yum %{_sysconfdir}/bash_completion.d || : +fi +%triggerun -- yum +[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/_yum || : -%triggerin -- vnc -%do_triggerin vncviewer -%triggerun -- vnc -%do_triggerun vncviewer +%bashcomp_trigger yum-arch %files -f %{name}-ghosts.list @@ -264,45 +263,61 @@ fi %config(noreplace) %{_sysconfdir}/profile.d/bash_completion.sh %{_sysconfdir}/bash_completion %dir %{_sysconfdir}/bash_completion.d/ +%{_sysconfdir}/bash_completion.d/bash-builtins +%{_sysconfdir}/bash_completion.d/configure +%{_sysconfdir}/bash_completion.d/dd +%{_sysconfdir}/bash_completion.d/getent +%{_sysconfdir}/bash_completion.d/iconv +%{_sysconfdir}/bash_completion.d/rpm %{_datadir}/%{name}/ %changelog +* Tue Nov 17 2009 Ville Skyttä - 1:1.1-3 +- Prepare for smooth coexistence with yum upstream completion. + +* Sun Nov 8 2009 Ville Skyttä - 1:1.1-2 +- Use yum-utils completion instead of ours if available. + +* Mon Oct 19 2009 Ville Skyttä - 1:1.1-1 +- Update to 1.1. +- bash 4 quoting fix, mock and repomanage completions included upstream. + * Sun Sep 20 2009 Ville Skyttä - 1:1.0-5 - Use svn completion from subversion instead of ours if available (#496456). * Fri Jul 24 2009 Fedora Release Engineering - 1:1.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild -* Sat Apr 18 2009 Ville Skyttä - 1:1.0-3 +* Sat Apr 18 2009 Ville Skyttä - 1:1.0-3 - Do not install cowsay completion, an updated version is shipped with it. -* Tue Apr 7 2009 Ville Skyttä - 1:1.0-2 +* Tue Apr 7 2009 Ville Skyttä - 1:1.0-2 - Apply upstream patch to fix quoting issues with bash 4.x (#490322). -* Mon Apr 6 2009 Ville Skyttä - 1:1.0-1 +* Mon Apr 6 2009 Ville Skyttä - 1:1.0-1 - 1.0. -* Mon Mar 23 2009 Ville Skyttä - 20080705-4.20090314gitf4f0984 +* Mon Mar 23 2009 Ville Skyttä - 20080705-4.20090314gitf4f0984 - Add dependency on coreutils for triggers (#490768). - Update and improve mock completion. -* Sun Mar 15 2009 Ville Skyttä - 20080705-3.20090314gitf4f0984 +* Sun Mar 15 2009 Ville Skyttä - 20080705-3.20090314gitf4f0984 - git snapshot f4f0984, fixes #484578 (another issue), #486998. * Mon Feb 23 2009 Fedora Release Engineering - 20080705-3.20090211git47d0c5b - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild -* Wed Feb 11 2009 Ville Skyttä - 20080705-2.20090211git47d0c5b +* Wed Feb 11 2009 Ville Skyttä - 20080705-2.20090211git47d0c5b - git snapshot 47d0c5b, fixes #484578. - lzop and repomanage completions included upstream. -* Sun Jan 18 2009 Ville Skyttä - 20080705-2.20090115bzr1252 +* Sun Jan 18 2009 Ville Skyttä - 20080705-2.20090115bzr1252 - r1252 snapshot; all patches applied upstream. - Do not install mercurial completion, an updated version is shipped with it. - Improve lzop and repomanage completion. -* Tue Jan 6 2009 Ville Skyttä - 20080705-1 +* Tue Jan 6 2009 Ville Skyttä - 20080705-1 - 20080705; new upstream at http://bash-completion.alioth.debian.org/ - Perl, Debian, and scp patches applied upstream. - Patch to improve man completion: more sections, better filename handling. @@ -310,10 +325,10 @@ fi - Patch to fix and speed up rpm installed packages completion. - Update mock completion. -* Thu Sep 25 2008 Ville Skyttä +* Thu Sep 25 2008 Ville Skyttä - More Matroska associations (#463829, based on patch from Yanko Kaneti). -* Thu Sep 11 2008 Ville Skyttä - 20060301-13 +* Thu Sep 11 2008 Ville Skyttä - 20060301-13 - Borrow/improve/adapt to Fedora some patches from Mandriva: improved support for getent and rpm --eval, better rpm backup file avoidance, lzma support. - Patch/unpatch to fix gzip and bzip2 options completion. @@ -321,177 +336,177 @@ fi - Add and trigger-install support for lzop. - Associate *.sqlite with sqlite3. -* Wed Jul 23 2008 Ville Skyttä - 20060301-12 +* Wed Jul 23 2008 Ville Skyttä - 20060301-12 - Fix plague-client completion install (#456355, Ricky Zhou). - Trigger-install support for sitecopy. -* Tue Apr 29 2008 Ville Skyttä - 20060301-11 +* Tue Apr 29 2008 Ville Skyttä - 20060301-11 - Media player association improvements (#444467). -* Sat Feb 23 2008 Ville Skyttä - 20060301-10 +* Sat Feb 23 2008 Ville Skyttä - 20060301-10 - Patch to fix filename completion with svn (#430059). - Trigger-install support for dsniff. - Drop disttag. -* Mon Dec 31 2007 Ville Skyttä - 20060301-8 +* Mon Dec 31 2007 Ville Skyttä - 20060301-8 - Associate VDR recording files with media players. - Update mock completion. -* Fri Nov 16 2007 Ville Skyttä - 20060301-7 +* Fri Nov 16 2007 Ville Skyttä - 20060301-7 - Add JPEG2000 extensions for display(1) (#304771). - Update mock completion. -* Sat Sep 22 2007 Ville Skyttä - 20060301-6 +* Sat Sep 22 2007 Ville Skyttä - 20060301-6 - Patch to improve perl completion (#299571, Jim Radford, http://use.perl.org/~Alias/journal/33508). -* Mon Aug 13 2007 Ville Skyttä - 20060301-5 +* Mon Aug 13 2007 Ville Skyttä - 20060301-5 - License: GPLv2+ * Sun Jun 24 2007 Jeff Sheltren - 20060301-4 - Update triggers to work with older versions of RPM -* Wed Feb 28 2007 Ville Skyttä - 20060301-3 +* Wed Feb 28 2007 Ville Skyttä - 20060301-3 - Fix scp with single quotes (#217178). - Borrow fix for bzip2 w/spaces, and apropos and whatis support from Debian. -* Thu Aug 31 2006 Ville Skyttä - 20060301-2 +* Thu Aug 31 2006 Ville Skyttä - 20060301-2 - Trigger-install support for gcl, lilypond, mercurial and svk. - Improve mock completion a bit. -* Thu Mar 2 2006 Ville Skyttä - 20060301-1 +* Thu Mar 2 2006 Ville Skyttä - 20060301-1 - 20060301, patches and profile.d scriptlet applied/included upstream. - Convert docs to UTF-8. -* Wed Feb 8 2006 Ville Skyttä - 20050721-4 +* Wed Feb 8 2006 Ville Skyttä - 20050721-4 - Don't source ourselves in non-interactive shells (#180419, Behdad Esfahbod). - Trigger-install snippets for clisp, gnatmake, isql, ri, sbcl, and snownews. -* Sat Feb 4 2006 Ville Skyttä +* Sat Feb 4 2006 Ville Skyttä - Add mtr(8) completion using known hosts (#179918, Yanko Kaneti). -* Sun Jan 8 2006 Ville Skyttä - 20050721-3 +* Sun Jan 8 2006 Ville Skyttä - 20050721-3 - Patch to hopefully fix quoting problems with bash 3.1 (#177056). -* Mon Nov 28 2005 Ville Skyttä - 20050721-2 +* Mon Nov 28 2005 Ville Skyttä - 20050721-2 - Work around potential login problem in profile.d snippet (#174355). -* Sat Nov 26 2005 Ville Skyttä +* Sat Nov 26 2005 Ville Skyttä - Don't mark the main source file as %%config. - Make profile.d snippet non-executable (#35714) and noreplace. - Add mock, plague-client and repomanage completion. - Allow "cvs stat" completion. - Macroize trigger creation. -* Fri Jul 22 2005 Ville Skyttä - 20050721-1 +* Fri Jul 22 2005 Ville Skyttä - 20050721-1 - 20050721. -* Wed Jul 20 2005 Ville Skyttä - 20050720-1 +* Wed Jul 20 2005 Ville Skyttä - 20050720-1 - 20050720, all patches applied upstream. -* Mon Jul 18 2005 Ville Skyttä - 20050712-1 +* Mon Jul 18 2005 Ville Skyttä - 20050712-1 - 20050712. - Add more OO.o2 extensions, and *.pdf for evince (#163520, Horst von Brand). - Add/fix support for some multimedia formats and players. - Fix tarball completion. -* Sat Jan 22 2005 Ville Skyttä - 0:20050121-2 +* Sat Jan 22 2005 Ville Skyttä - 0:20050121-2 - Update to 20050121. -* Thu Jan 13 2005 Ville Skyttä - 0:20050112-1 +* Thu Jan 13 2005 Ville Skyttä - 0:20050112-1 - Update to 20050112, openssl patch applied upstream. -* Wed Jan 5 2005 Ville Skyttä - 0:20050103-1 +* Wed Jan 5 2005 Ville Skyttä - 0:20050103-1 - Update to 20050103. -* Sat Nov 27 2004 Ville Skyttä - 0:20041017-5 +* Sat Nov 27 2004 Ville Skyttä - 0:20041017-5 - Change version scheme, bump release to provide Extras upgrade path. -* Sat Nov 6 2004 Ville Skyttä 0:0.0-0.fdr.4.20041017 +* Sat Nov 6 2004 Ville Skyttä 0:0.0-0.fdr.4.20041017 - Do the right thing with bash >= 3 too in profile.d snippet (bug 2228, thanks to Thorsten Leemhuis). -* Mon Oct 18 2004 Ville Skyttä 0:0.0-0.fdr.3.20041017 +* Mon Oct 18 2004 Ville Skyttä 0:0.0-0.fdr.3.20041017 - Update to 20041017, adds dhclient, lvm, and bittorrent completion. -* Mon Jul 12 2004 Ville Skyttä 0:0.0-0.fdr.3.20040711 +* Mon Jul 12 2004 Ville Skyttä 0:0.0-0.fdr.3.20040711 - Update to 20040711, patches applied upstream. -* Sun Jul 4 2004 Ville Skyttä 0:0.0-0.fdr.3.20040704 +* Sun Jul 4 2004 Ville Skyttä 0:0.0-0.fdr.3.20040704 - Update to 20040704. - Change to symlinked /etc/bash_completion.d snippets, add patch to read them. -* Wed May 26 2004 Ville Skyttä 0:0.0-0.fdr.3.20040526 +* Wed May 26 2004 Ville Skyttä 0:0.0-0.fdr.3.20040526 - Update to 20040526. -* Thu Apr 1 2004 Ville Skyttä 0:0.0-0.fdr.3.20040331 +* Thu Apr 1 2004 Ville Skyttä 0:0.0-0.fdr.3.20040331 - Add command-specific contrib snippet copying triggers. -* Thu Apr 1 2004 Ville Skyttä 0:0.0-0.fdr.2.20040331 +* Thu Apr 1 2004 Ville Skyttä 0:0.0-0.fdr.2.20040331 - Update to 20040331. -* Sun Feb 15 2004 Ville Skyttä 0:0.0-0.fdr.2.20040214 +* Sun Feb 15 2004 Ville Skyttä 0:0.0-0.fdr.2.20040214 - Update to 20040214. -* Wed Feb 11 2004 Ville Skyttä 0:0.0-0.fdr.2.20040210 +* Wed Feb 11 2004 Ville Skyttä 0:0.0-0.fdr.2.20040210 - Update to 20040210. -* Fri Jan 2 2004 Ville Skyttä 0:0.0-0.fdr.2.20040101 +* Fri Jan 2 2004 Ville Skyttä 0:0.0-0.fdr.2.20040101 - Update to 20040101. - Update %%description. -* Sat Dec 27 2003 Ville Skyttä 0:0.0-0.fdr.2.20031225 +* Sat Dec 27 2003 Ville Skyttä 0:0.0-0.fdr.2.20031225 - Update to 20031225. -* Sat Dec 20 2003 Ville Skyttä 0:0.0-0.fdr.2.20031215 +* Sat Dec 20 2003 Ville Skyttä 0:0.0-0.fdr.2.20031215 - Don't pull in *.rpm* from %%{_sysconfdir}/bash_completion.d. -* Mon Dec 15 2003 Ville Skyttä 0:0.0-0.fdr.1.20031215 +* Mon Dec 15 2003 Ville Skyttä 0:0.0-0.fdr.1.20031215 - Update to 20031215. -* Sun Nov 30 2003 Ville Skyttä 0:0.0-0.fdr.1.20031125 +* Sun Nov 30 2003 Ville Skyttä 0:0.0-0.fdr.1.20031125 - Update to 20031125. -* Thu Nov 13 2003 Ville Skyttä 0:0.0-0.fdr.1.20031112 +* Thu Nov 13 2003 Ville Skyttä 0:0.0-0.fdr.1.20031112 - Update to 20031112. -* Wed Oct 22 2003 Ville Skyttä 0:0.0-0.fdr.1.20031022 +* Wed Oct 22 2003 Ville Skyttä 0:0.0-0.fdr.1.20031022 - Update to 20031022. -* Tue Oct 7 2003 Ville Skyttä 0:0.0-0.fdr.1.20031007 +* Tue Oct 7 2003 Ville Skyttä 0:0.0-0.fdr.1.20031007 - Update to 20031007. -* Tue Sep 30 2003 Ville Skyttä 0:0.0-0.fdr.1.20030929 +* Tue Sep 30 2003 Ville Skyttä 0:0.0-0.fdr.1.20030929 - Update to 20030929. -* Fri Sep 12 2003 Ville Skyttä 0:0.0-0.fdr.1.20030911 +* Fri Sep 12 2003 Ville Skyttä 0:0.0-0.fdr.1.20030911 - Update to 20030911. -* Thu Aug 21 2003 Ville Skyttä 0:0.0-0.fdr.1.20030821 +* Thu Aug 21 2003 Ville Skyttä 0:0.0-0.fdr.1.20030821 - Update to 20030821. - Drop .nosrc.rpm patch, already applied upstream. -* Sat Aug 16 2003 Ville Skyttä 0:0.0-0.fdr.1.20030811 +* Sat Aug 16 2003 Ville Skyttä 0:0.0-0.fdr.1.20030811 - Update to 20030811. - Patch to make rpm --rebuild work with .nosrc.rpm's. -* Sun Aug 3 2003 Ville Skyttä - 0:0.0-0.fdr.1.20030803 +* Sun Aug 3 2003 Ville Skyttä - 0:0.0-0.fdr.1.20030803 - Update to 20030803. -* Wed Jul 23 2003 Ville Skyttä - 0:0.0-0.fdr.1.20030721 +* Wed Jul 23 2003 Ville Skyttä - 0:0.0-0.fdr.1.20030721 - Update to 20030721. -* Sun Jul 13 2003 Ville Skyttä - 0:0.0-0.fdr.1.20030713 +* Sun Jul 13 2003 Ville Skyttä - 0:0.0-0.fdr.1.20030713 - Update to 20030713. -* Mon Jun 30 2003 Ville Skyttä - 0:0.0-0.fdr.1.20030630 +* Mon Jun 30 2003 Ville Skyttä - 0:0.0-0.fdr.1.20030630 - Update to 20030630. -* Sun Jun 8 2003 Ville Skyttä - 0:0.0-0.fdr.1.20030607 +* Sun Jun 8 2003 Ville Skyttä - 0:0.0-0.fdr.1.20030607 - Update to 20030607. -* Tue May 27 2003 Ville Skyttä - 0:0.0-0.fdr.1.20030527 +* Tue May 27 2003 Ville Skyttä - 0:0.0-0.fdr.1.20030527 - Update to 20030527. -* Sat May 24 2003 Ville Skyttä - 0:0.0-0.fdr.1.20030505 +* Sat May 24 2003 Ville Skyttä - 0:0.0-0.fdr.1.20030505 - First build. diff --git a/bash_completion.sh b/bash_completion.sh new file mode 100644 index 0000000..915960b --- /dev/null +++ b/bash_completion.sh @@ -0,0 +1,12 @@ +# Check for interactive bash and that we haven't already been sourced. +[ -z "$BASH_VERSION" -o -z "$PS1" -o -n "$BASH_COMPLETION" ] && return + +# Check for recent enough version of bash. +bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.} +if [ $bmajor -eq 2 -a $bminor '>' 04 ] || [ $bmajor -gt 2 ]; then + if [ -r /etc/bash_completion ]; then + # Source completion code. + . /etc/bash_completion + fi +fi +unset bash bminor bmajor diff --git a/sources b/sources index 00208f6..8d9c57e 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -cd1c5648272917fbe0eef4ba30bb93f4 bash-completion-1.0.tar.gz +1b5ed247ed904d0a2ec6a6d2c5876c52 bash-completion-1.1.tar.bz2 +7daa098026ae41f6c51a3f03035218f3 CHANGES-1.1