diff options
author | Michael Cummings <mcummings@gentoo.org> | 2004-09-30 01:04:23 +0000 |
---|---|---|
committer | Michael Cummings <mcummings@gentoo.org> | 2004-09-30 01:04:23 +0000 |
commit | 03dca469b536309a2c20d7f3bee8050c2dd386e4 (patch) | |
tree | 707968ed181d2632ce3c83f4cf86b2085fe6b2da /app-misc | |
parent | We release under GPL v2. (Manifest recommit) (diff) | |
download | gentoo-2-03dca469b536309a2c20d7f3bee8050c2dd386e4.tar.gz gentoo-2-03dca469b536309a2c20d7f3bee8050c2dd386e4.tar.bz2 gentoo-2-03dca469b536309a2c20d7f3bee8050c2dd386e4.zip |
bug 65837
Diffstat (limited to 'app-misc')
-rw-r--r-- | app-misc/bins/ChangeLog | 7 | ||||
-rw-r--r-- | app-misc/bins/files/bins-1.1.26-install.patch | 26 |
2 files changed, 29 insertions, 4 deletions
diff --git a/app-misc/bins/ChangeLog b/app-misc/bins/ChangeLog index 5fc72f5dd31b..dd81273fee9a 100644 --- a/app-misc/bins/ChangeLog +++ b/app-misc/bins/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-misc/bins # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/bins/ChangeLog,v 1.22 2004/09/27 10:11:21 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/bins/ChangeLog,v 1.23 2004/09/30 01:04:23 mcummings Exp $ + + 29 Sep 2004; Michael Cummings <mcummings@gentoo.org> + files/bins-1.1.26-install.patch: + Updated bash-completion fixes for the patch; thanks go to CFuga + <cfuga@itam.mx> in bug 65837 for working on this 27 Sep 2004; Michael Cummings <mcummings@gentoo.org> bins-1.1.26-r1.ebuild, -bins-1.1.26.ebuild: diff --git a/app-misc/bins/files/bins-1.1.26-install.patch b/app-misc/bins/files/bins-1.1.26-install.patch index fbaef17fd70c..d062e1f5dc59 100644 --- a/app-misc/bins/files/bins-1.1.26-install.patch +++ b/app-misc/bins/files/bins-1.1.26-install.patch @@ -1,5 +1,5 @@ ---- install.sh.old 2004-06-15 06:34:53.000000000 +0000 -+++ install.sh 2004-06-15 06:38:01.000000000 +0000 +--- install.sh.old 2004-05-24 08:31:08.000000000 -0500 ++++ install.sh 2004-09-29 13:59:04.911944000 -0500 @@ -23,11 +23,12 @@ RC="${RC:-/etc/bins}" GLOBAL_RC="$RC" @@ -31,7 +31,7 @@ - mkdir -p $RC 2>/dev/null || true - if [ -w $RC ]; then + mkdir -p $DESTRC 2>/dev/null || true -+ if [ -w $DESTRC ]; then ++ if [ -w $DESTRC ]; then echo "Installing configuration file in $RC" - cp binsrc $RC + cp binsrc $DESTRC @@ -52,3 +52,23 @@ return 1 fi } +@@ -179,16 +180,9 @@ + fi + + # bash completion +-if [ -w /etc/bash_completion.d ] ; then +- echo "Installing bash completion system wide." +- cp -f bash_completion /etc/bash_completion.d/bins +-else +- mkdir ~/.bash_completion 2>/dev/null || true +- if [ -w ~/.bash_completion ] ; then +- echo "Installing bash completion for user `whoami`." +- cp -f bash_completion ~/.bash_completion/bins +- fi +-fi ++echo "Installing bash completion system wide." ++mkdir -p $SHARE/bash-completion ++cp -f bash_completion $SHARE/bash-completion/bins + + # I18N files + mkdir -p $LOCALE 2>/dev/null || true |