Revision: 6819
http://gar.svn.sourceforge.net/gar/?rev=6819&view=rev
Author: chninkel
Date: 2009-10-10 21:34:11 +0000 (Sat, 10 Oct 2009)
Log Message:
-----------
bash_completion: updated opencsw paths patch
Modified Paths:
--------------
csw/mgar/pkg/bash_completion/trunk/checksums
csw/mgar/pkg/bash_completion/trunk/files/opencsw_paths.patch
Modified: csw/mgar/pkg/bash_completion/trunk/checksums
===================================================================
--- csw/mgar/pkg/bash_completion/trunk/checksums 2009-10-10 20:42:36 UTC
(rev 6818)
+++ csw/mgar/pkg/bash_completion/trunk/checksums 2009-10-10 21:34:11 UTC
(rev 6819)
@@ -1,6 +1,6 @@
593d3edcf287b9e9d735049bd4d3f229 bash-completion-1.1.tar.gz
d7870800fc6e52484cc8faf32865e2cc changelog.CSW
-d0c0d867babf351bca9ee97e03be550d opencsw_paths.patch
+4c7dc3d0486ba84c5c0bbb57ee5ac420 opencsw_paths.patch
5bc234f6060561c564a20d2a9cc552c1 pkg-get.completion
af7a63477c6e81ed5b08f195e153091e pkgadd.completion
1389a7771e34fc54fe993d442cce1524 pkgrm.completion
Modified: csw/mgar/pkg/bash_completion/trunk/files/opencsw_paths.patch
===================================================================
--- csw/mgar/pkg/bash_completion/trunk/files/opencsw_paths.patch
2009-10-10 20:42:36 UTC (rev 6818)
+++ csw/mgar/pkg/bash_completion/trunk/files/opencsw_paths.patch
2009-10-10 21:34:11 UTC (rev 6819)
@@ -1,6 +1,7 @@
---- bash-completion-1.0/bash_completion 2009-04-02 22:01:39.000000000
+0200
-+++ bash-completion-1.0/bash_completion.new 2009-04-04 19:21:58.156466726
+0200
-@@ -42,8 +42,8 @@
+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 @@
# Alter the following to reflect the location of this file.
#
@@ -8,38 +9,26 @@
-[ -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
- readonly BASH_COMPLETION BASH_COMPLETION_DIR
+ [ -n "$BASH_COMPLETION_COMPAT_DIR" ] ||
BASH_COMPLETION_COMPAT_DIR=/etc/bash_completion.d
+ readonly BASH_COMPLETION BASH_COMPLETION_DIR BASH_COMPLETION_COMPAT_DIR
- # Set a couple of useful vars
-@@ -2657,6 +2657,8 @@
- [ -r "$configfile" ] &&
- config=( "${conf...@]}" "$configfile" )
- else
-+ [ -r /opt/csw/etc/ssh/ssh_config ] &&
-+ config=( "${conf...@]}" "/opt/csw/etc/ssh/ssh_config" )
- [ -r /etc/ssh/ssh_config ] &&
- config=( "${conf...@]}" "/etc/ssh/ssh_config" )
- [ -r "${HOME}/.ssh/config" ] &&
-@@ -2676,6 +2678,8 @@
- [ -r "$global_kh" ] &&
- kh=( "${...@]}" "$global_kh" )
- if [ -z "$configfile" ]; then
-+ [ -r /opt/csw/etc/ssh/ssh_known_hosts ] &&
-+ kh=( "${...@]}" /opt/csw/etc/ssh/ssh_known_hosts )
- [ -r /etc/ssh/ssh_known_hosts ] &&
- kh=( "${...@]}" /etc/ssh/ssh_known_hosts )
- [ -r /etc/ssh/ssh_known_hosts2 ] &&
---- bash-completion-1.0/bash_completion.sh 2009-04-02 22:01:42.000000000
+0200
-+++ bash-completion-1.0/bash_completion.sh.new 2009-04-04 19:22:33.430034421
+0200
-@@ -4,9 +4,9 @@
- # 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
-+ if [ -r /opt/csw/etc/bash_completion ]; then
- # Source completion code.
-- . /etc/bash_completion
-+ . /opt/csw/etc/bash_completion
- fi
- fi
- unset bash bminor bmajor
+@@ -1196,6 +1196,8 @@
+ [ -r "$configfile" ] &&
+ config=( "${conf...@]}" "$configfile" )
+ else
++ [ -r /opt/csw/etc/ssh/ssh_config ] &&
++ config=( "${conf...@]}" "/opt/csw/etc/ssh/ssh_config" )
+ [ -r /etc/ssh/ssh_config ] &&
+ config=( "${conf...@]}" "/etc/ssh/ssh_config" )
+ [ -r "${HOME}/.ssh/config" ] &&
+@@ -1223,6 +1225,10 @@
+ [ -r "$global_kh" ] &&
+ kh=( "${...@]}" "${global_...@]}" )
+ if [ -z "$configfile" ]; then
++ [ -r /opt/csw/etc/ssh/ssh_known_hosts ] &&
++ kh=( "${...@]}" /opt/csw/etc/ssh/ssh_known_hosts )
++ [ -r /opt/csw/etc/ssh/ssh_known_hosts2 ] &&
++ kh=( "${...@]}" /opt/csw/etc/ssh/ssh_known_hosts2 )
+ [ -r /etc/ssh/ssh_known_hosts ] &&
+ kh=( "${...@]}" /etc/ssh/ssh_known_hosts )
+ [ -r /etc/ssh/ssh_known_hosts2 ] &&
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
[email protected]
https://lists.opencsw.org/mailman/listinfo/devel
