[csw-devel] SF.net SVN: gar:[19073] csw/mgar/pkg/bash_completion/trunk
chninkel at users.sourceforge.net
chninkel at users.sourceforge.net
Thu Aug 23 22:15:22 CEST 2012
Revision: 19073
http://gar.svn.sourceforge.net/gar/?rev=19073&view=rev
Author: chninkel
Date: 2012-08-23 20:15:21 +0000 (Thu, 23 Aug 2012)
Log Message:
-----------
bash_completion/trunk: updated to 2.0
Modified Paths:
--------------
csw/mgar/pkg/bash_completion/trunk/Makefile
csw/mgar/pkg/bash_completion/trunk/checksums
csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW
csw/mgar/pkg/bash_completion/trunk/files/opencsw_paths.patch
Added Paths:
-----------
csw/mgar/pkg/bash_completion/trunk/files/more_opencsw_paths.patch
Modified: csw/mgar/pkg/bash_completion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bash_completion/trunk/Makefile 2012-08-23 15:18:47 UTC (rev 19072)
+++ csw/mgar/pkg/bash_completion/trunk/Makefile 2012-08-23 20:15:21 UTC (rev 19073)
@@ -13,7 +13,7 @@
###### Package information #######
NAME = bash_completion
-VERSION = 1.1
+VERSION = 2.0
CATEGORIES = xtra
GARTYPE = v2
@@ -27,7 +27,28 @@
PACKAGES = CSWbashcmplt
CATALOGNAME_CSWbashcmplt = bash_completion
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+# We will not change that today
+CHECKPKG_OVERRIDES_CSWbashcmplt += catalogname-does-not-match-pkgname|pkgname=CSWbashcmplt|catalogname=bash_completion|expected-catalogname=bashcmplt
+# bash will complete if python s
+CHECKPKG_OVERRIDES_CSWbashcmplt += missing-dependency|CSWpython
+
+# No remaining /usr/share, /usr/local references are ok
+CHECKPKG_OVERRIDES_CSWbashcmplt += file-with-bad-content|/usr/share|root/opt/csw/share/doc/bash_completion/CHANGES
+CHECKPKG_OVERRIDES_CSWbashcmplt += file-with-bad-content|/usr/share|root/opt/csw/share/bash-completion/completions/wtf
+CHECKPKG_OVERRIDES_CSWbashcmplt += file-with-bad-content|/usr/share|root/opt/csw/share/bash-completion/completions/openssl
+CHECKPKG_OVERRIDES_CSWbashcmplt += file-with-bad-content|/usr/share|root/opt/csw/share/bash-completion/completions/dict
+CHECKPKG_OVERRIDES_CSWbashcmplt += file-with-bad-content|/usr/share|root/opt/csw/share/bash-completion/completions/lintian
+CHECKPKG_OVERRIDES_CSWbashcmplt += file-with-bad-content|/usr/share|root/opt/csw/share/bash-completion/completions/dpkg
+CHECKPKG_OVERRIDES_CSWbashcmplt += file-with-bad-content|/usr/share|root/opt/csw/share/bash-completion/completions/mplayer
+CHECKPKG_OVERRIDES_CSWbashcmplt += file-with-bad-content|/usr/local|root/opt/csw/share/bash-completion/bash_completion
+CHECKPKG_OVERRIDES_CSWbashcmplt += file-with-bad-content|/usr/local|root/opt/csw/share/bash-completion/completions/puppet
+CHECKPKG_OVERRIDES_CSWbashcmplt += file-with-bad-content|/usr/local|root/opt/csw/share/bash-completion/completions/sudo
+CHECKPKG_OVERRIDES_CSWbashcmplt += file-with-bad-content|/usr/local|root/opt/csw/share/bash-completion/completions/mplayer
+
+
+
###### Upstream and OpenCSW files information #######
MASTER_SITES = http://bash-completion.alioth.debian.org/files/
@@ -45,8 +66,8 @@
# change the paths to use opencsw ones
PATCHFILES = opencsw_paths.patch
+PATCHFILES += more_opencsw_paths.patch
-
##### Build and installation information #####
# the configure script doesn't seem to take in account the prefix
@@ -62,13 +83,13 @@
merge-opencsw-completion:
@( for FILE in $(WORKDIR)/*.completion; do \
NFILE="`basename $$FILE | sed -e 's/\.completion$$//'`"; \
- ginstall -D $$FILE $(PKGROOT)$(sysconfdir)/bash_completion.d/$$NFILE; \
+ ginstall -D $$FILE $(PKGROOT)$(sharedstatedir)/bash_completion.d/$$NFILE; \
done )
@$(MAKECOOKIE)
merge-additional-docs:
- @( for FILE in AUTHORS README TODO; do \
+ @( for FILE in AUTHORS README CHANGES; do \
ginstall -D "$(WORKSRC_FIRSTMOD)/$$FILE" "$(PKGROOT)$(docdir)/$(NAME)/$$FILE"; \
done )
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/bash_completion/trunk/checksums
===================================================================
--- csw/mgar/pkg/bash_completion/trunk/checksums 2012-08-23 15:18:47 UTC (rev 19072)
+++ csw/mgar/pkg/bash_completion/trunk/checksums 2012-08-23 20:15:21 UTC (rev 19073)
@@ -1,8 +1 @@
-593d3edcf287b9e9d735049bd4d3f229 bash-completion-1.1.tar.gz
-075292057aa7dce8fb78dba076ee0832 changelog.CSW
-4c7dc3d0486ba84c5c0bbb57ee5ac420 opencsw_paths.patch
-5bc234f6060561c564a20d2a9cc552c1 pkg-get.completion
-af7a63477c6e81ed5b08f195e153091e pkgadd.completion
-1389a7771e34fc54fe993d442cce1524 pkgrm.completion
-f922762210a6f208695c328c040ac90d pkgutil.completion
-52bd6948f5cc1548c3791a969da0e5e2 smf.completion
+48616c0e3704e8ff7b6d9842f6b7a2de bash-completion-2.0.tar.gz
Modified: csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW 2012-08-23 15:18:47 UTC (rev 19072)
+++ csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW 2012-08-23 20:15:21 UTC (rev 19073)
@@ -1,3 +1,9 @@
+bash_completion (2.0,REV=2012.08.23)
+
+ * New upstream version.
+
+ -- Yann Rouillard <yann at opencsw.org> Thu, 23 Aug 2012 21:16:42 +0200
+
bash_completion (1.1,REV=2009.10.11)
* New upstream version.
Added: csw/mgar/pkg/bash_completion/trunk/files/more_opencsw_paths.patch
===================================================================
--- csw/mgar/pkg/bash_completion/trunk/files/more_opencsw_paths.patch (rev 0)
+++ csw/mgar/pkg/bash_completion/trunk/files/more_opencsw_paths.patch 2012-08-23 20:15:21 UTC (rev 19073)
@@ -0,0 +1,131 @@
+From ee675623afd6ed49d2af21eec4553ce09ac98d41 Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Thu, 23 Aug 2012 22:06:00 +0200
+Subject: [PATCH 3/3] More opencsw paths fix
+
+---
+ README | 4 ++--
+ completions/info | 2 +-
+ completions/munindoc | 2 +-
+ completions/mysql | 6 ++++--
+ completions/openssl | 4 ++--
+ completions/puppet | 2 +-
+ completions/rdesktop | 2 +-
+ completions/sudo | 2 +-
+ 8 files changed, 13 insertions(+), 11 deletions(-)
+
+diff --git a/README b/README
+index 1558f62..b50983f 100644
+--- a/README
++++ b/README
+@@ -8,8 +8,8 @@ from either /etc/bashrc or ~/.bashrc (or any other file sourcing those). You
+ can do this by simply using:
+
+ # Use bash-completion, if available
+-[[ $PS1 && -f /usr/share/bash-completion/bash_completion ]] && \
+- . /usr/share/bash-completion/bash_completion
++[[ $PS1 && -f /opt/csw/share/bash-completion/bash_completion ]] && \
++ . /opt/csw/share/bash-completion/bash_completion
+
+ (if you happen to have *only* bash >= 4.1 installed, see further if not)
+
+diff --git a/completions/info b/completions/info
+index 3655044..1b164a5 100644
+--- a/completions/info
++++ b/completions/info
+@@ -41,7 +41,7 @@ _info()
+ return
+ fi
+
+- local i infopath=/usr/share/info
++ local i infopath=/opt/csw/share/info
+
+ if [[ $INFOPATH == *: ]]; then
+ infopath=${INFOPATH}${infopath}
+diff --git a/completions/munindoc b/completions/munindoc
+index c5a03c1..81df7d4 100644
+--- a/completions/munindoc
++++ b/completions/munindoc
+@@ -6,7 +6,7 @@ _munindoc()
+ _init_completion || return
+
+ COMPREPLY=( $( compgen -W \
+- '$( command ls /usr/share/munin/plugins 2>/dev/null )' -- "$cur" ) )
++ '$( command ls /opt/csw/libexec/munin/plugins 2>/dev/null )' -- "$cur" ) )
+ } &&
+ complete -F _munindoc munindoc
+
+diff --git a/completions/mysql b/completions/mysql
+index c41c166..710be90 100644
+--- a/completions/mysql
++++ b/completions/mysql
+@@ -20,8 +20,10 @@ _mysql()
+ return 0
+ ;;
+ --default-character-set)
+- [[ -d /usr/share/mysql/charsets ]] && \
+- COMPREPLY=( $( compgen -W "$(command ls /usr/share/mysql/charsets|sed -e '/^\(README\|Index\.xml\)$/d' -e 's/.xml$//') utf8" -- "$cur" ) )
++ for _PREFIX in /opt/csw /usr; do
++ [[ -d $_PREFIX/share/mysql/charsets ]] && \
++ COMPREPLY=( $( compgen -W "$(command ls $_PREFIX/share/mysql/charsets|sed -e '/^\(README\|Index\.xml\)$/d' -e 's/.xml$//') utf8" -- "$cur" ) )
++ done
+ return 0
+ ;;
+
+diff --git a/completions/openssl b/completions/openssl
+index b63d215..7319a62 100644
+--- a/completions/openssl
++++ b/completions/openssl
+@@ -14,8 +14,8 @@ _openssl_sections()
+
+ # if no config given, check some usual default locations
+ if [[ -z $config ]]; then
+- for f in /etc/ssl/openssl.cnf /etc/pki/tls/openssl.cnf \
+- /usr/share/ssl/openssl.cnf; do
++ for f in /etc/opt/csw/ssl/openssl.cnf /etc/ssl/openssl.cnf \
++ /etc/pki/tls/openssl.cnf /usr/share/ssl/openssl.cnf; do
+ [[ -f $f ]] && config=$f && break
+ done
+ fi
+diff --git a/completions/puppet b/completions/puppet
+index 66a81b3..085affb 100644
+--- a/completions/puppet
++++ b/completions/puppet
+@@ -18,7 +18,7 @@ _puppet_digest()
+ _puppet_certs()
+ {
+ local puppetca="puppet cert"
+- PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetca &>/dev/null \
++ PATH=$PATH:/opt/csw/sbin:/sbin:/usr/sbin:/usr/local/sbin type puppetca &>/dev/null \
+ && puppetca=puppetca
+
+ if [[ "$1" = '--all' ]]; then
+diff --git a/completions/rdesktop b/completions/rdesktop
+index 48a9175..7d84677 100644
+--- a/completions/rdesktop
++++ b/completions/rdesktop
+@@ -8,7 +8,7 @@ _rdesktop()
+ case $prev in
+ -k)
+ COMPREPLY=( $( command ls \
+- /usr/share/rdesktop/keymaps 2>/dev/null | \
++ /opt/csw/share/rdesktop/keymaps 2>/dev/null | \
+ command grep -E -v '(common|modifiers)' ) )
+ COMPREPLY+=( $( command ls $HOME/.rdesktop/keymaps 2>/dev/null ) )
+ COMPREPLY+=( $( command ls ./keymaps 2>/dev/null ) )
+diff --git a/completions/sudo b/completions/sudo
+index b13b731..d507100 100644
+--- a/completions/sudo
++++ b/completions/sudo
+@@ -11,7 +11,7 @@ _sudo()
+ [[ $mode == normal ]] &&
+ for (( i=1; i <= COMP_CWORD; i++ )); do
+ if [[ ${COMP_WORDS[i]} != -* ]]; then
+- local PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin
++ local PATH=$PATH:/opt/csw/sbin:/sbin:/usr/sbin:/usr/local/sbin
+ local root_command=${COMP_WORDS[i]}
+ _command_offset $i
+ return
+--
+1.7.11.3
+
Modified: csw/mgar/pkg/bash_completion/trunk/files/opencsw_paths.patch
===================================================================
--- csw/mgar/pkg/bash_completion/trunk/files/opencsw_paths.patch 2012-08-23 15:18:47 UTC (rev 19072)
+++ csw/mgar/pkg/bash_completion/trunk/files/opencsw_paths.patch 2012-08-23 20:15:21 UTC (rev 19073)
@@ -1,34 +1,62 @@
-diff --speed-large-files --minimal -Nru bash-completion-1.1.orig/bash_completion bash-completion-1.1/bash_completion
---- bash-completion-1.1.orig/bash_completion 2009-10-10 23:29:39.177572555 +0200
-+++ bash-completion-1.1/bash_completion 2009-10-10 23:29:13.520556369 +0200
-@@ -40,8 +40,8 @@
+From 30f91fb677f8da10b97c60e624c5c3a9173eebff Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Thu, 23 Aug 2012 21:50:01 +0200
+Subject: [PATCH] Opencsw path addition
+
+---
+ bash_completion | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/bash_completion b/bash_completion
+index d6ae8ae..4e9a3b5 100644
+--- a/bash_completion
++++ b/bash_completion
+@@ -40,8 +40,8 @@ fi
- # Alter the following to reflect the location of this file.
+ # Set the following to the location of the backwards compat completion dir.
#
--[ -n "$BASH_COMPLETION" ] || BASH_COMPLETION=/etc/bash_completion
--[ -n "$BASH_COMPLETION_DIR" ] || BASH_COMPLETION_DIR=/etc/bash_completion.d
-+[ -n "$BASH_COMPLETION" ] || BASH_COMPLETION=/opt/csw/etc/bash_completion
-+[ -n "$BASH_COMPLETION_DIR" ] || BASH_COMPLETION_DIR=/opt/csw/etc/bash_completion.d
- [ -n "$BASH_COMPLETION_COMPAT_DIR" ] || BASH_COMPLETION_COMPAT_DIR=/etc/bash_completion.d
- readonly BASH_COMPLETION BASH_COMPLETION_DIR BASH_COMPLETION_COMPAT_DIR
+-: ${BASH_COMPLETION_COMPAT_DIR:=/etc/bash_completion.d}
+-readonly BASH_COMPLETION_COMPAT_DIR
++: ${BASH_COMPLETION_COMPAT_DIR_LIST:=/opt/csw/etc/bash_completion.d /etc/opt/csw/bash_completion.d}
++readonly BASH_COMPLETION_COMPAT_DIR_LIST
-@@ -1196,6 +1196,8 @@
- [ -r "$configfile" ] &&
- config=( "${config[@]}" "$configfile" )
+ # Blacklisted completions, causing problems with our code.
+ #
+@@ -1429,7 +1429,7 @@ _known_hosts_real()
+ if [[ -n $configfile ]]; then
+ [[ -r $configfile ]] && config+=( "$configfile" )
else
-+ [ -r /opt/csw/etc/ssh/ssh_config ] &&
-+ config=( "${config[@]}" "/opt/csw/etc/ssh/ssh_config" )
- [ -r /etc/ssh/ssh_config ] &&
- config=( "${config[@]}" "/etc/ssh/ssh_config" )
- [ -r "${HOME}/.ssh/config" ] &&
-@@ -1223,6 +1225,10 @@
- [ -r "$global_kh" ] &&
- kh=( "${kh[@]}" "${global_kh[@]}" )
- if [ -z "$configfile" ]; then
-+ [ -r /opt/csw/etc/ssh/ssh_known_hosts ] &&
-+ kh=( "${kh[@]}" /opt/csw/etc/ssh/ssh_known_hosts )
-+ [ -r /opt/csw/etc/ssh/ssh_known_hosts2 ] &&
-+ kh=( "${kh[@]}" /opt/csw/etc/ssh/ssh_known_hosts2 )
- [ -r /etc/ssh/ssh_known_hosts ] &&
- kh=( "${kh[@]}" /etc/ssh/ssh_known_hosts )
- [ -r /etc/ssh/ssh_known_hosts2 ] &&
+- for i in /etc/ssh/ssh_config ~/.ssh/config ~/.ssh2/config; do
++ for i in /etc/opt/csw/ssh/ssh_config /etc/ssh/ssh_config ~/.ssh/config ~/.ssh2/config; do
+ [[ -r $i ]] && config+=( "$i" )
+ done
+ fi
+@@ -1462,7 +1462,8 @@ _known_hosts_real()
+
+ if [[ -z $configfile ]]; then
+ # Global and user known_hosts files
+- for i in /etc/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts2 \
++ for i in /etc/opt/csw/ssh/ssh_known_hosts /etc/opt/csw/ssh/ssh_known_hosts2 \
++ /etc/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts2 \
+ /etc/known_hosts /etc/known_hosts2 ~/.ssh/known_hosts \
+ ~/.ssh/known_hosts2; do
+ [[ -r $i ]] && kh+=( "$i" )
+@@ -1947,6 +1948,7 @@ _xfunc()
+ }
+
+ # source compat completion directory definitions
++for BASH_COMPLETION_COMPAT_DIR in $BASH_COMPLETION_COMPAT_DIR_LIST; do
+ if [[ -d $BASH_COMPLETION_COMPAT_DIR && -r $BASH_COMPLETION_COMPAT_DIR && \
+ -x $BASH_COMPLETION_COMPAT_DIR ]]; then
+ for i in $(LC_ALL=C command ls "$BASH_COMPLETION_COMPAT_DIR"); do
+@@ -1955,6 +1957,7 @@ if [[ -d $BASH_COMPLETION_COMPAT_DIR && -r $BASH_COMPLETION_COMPAT_DIR && \
+ && -f $i && -r $i ]] && . "$i"
+ done
+ fi
++done
+ unset i _blacklist_glob
+
+ # source user completion file
+--
+1.7.11.3
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list