[gentoo-commits] gentoo-x86 commit in eclass: db.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/05/11 07:58:43

  Modified:             db.eclass
  Log:
  Improve binary renaming to NOT rename all elements in the path, and also pick up binaries that match the prefix of 'db' but not 'db_'.

Revision  Changes    Path
1.37                 eclass/db.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/db.eclass?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/db.eclass?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/db.eclass?r1=1.36&r2=1.37

Index: db.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/db.eclass,v
retrieving revision 1.36
retrieving revision 1.37
diff -p -w -b -B -u -u -r1.36 -r1.37
--- db.eclass	4 May 2010 08:03:40 -0000	1.36
+++ db.eclass	11 May 2010 07:58:43 -0000	1.37
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/db.eclass,v 1.36 2010/05/04 08:03:40 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/db.eclass,v 1.37 2010/05/11 07:58:43 robbat2 Exp $
 # This is a common location for functions used in the sys-libs/db ebuilds
 #
 # Bugs: pauldv@g.o
@@ -90,10 +90,13 @@ db_src_install_examples() {
 
 db_src_install_usrbinslot() {
 	# slot all program names to avoid overwriting
-	for fname in "${D}"/usr/bin/db_*
+	for fname in "${D}"/usr/bin/db*
 	do
-		mv "${fname}" "${fname//\/db_//db${SLOT}_}" || \
-			die "Failed to rename ${fname}"
+		dn="$(dirname "${fname}")"
+		bn="$(basename "${fname}")"
+		bn="${bn/db/db${SLOT}}"
+		mv "${fname}" "${dn}/${bn}" || \
+			die "Failed to rename ${fname} to ${dn}/${bn}"
 	done
 }