[patch] db.patch

db.patch (text/plain), 3.07 KB, created by Markus Meier on 2009-02-08 16:52:05 UTC

Index: db.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/db.eclass,v
retrieving revision 1.30
diff -u -B -r1.30 db.eclass
--- db.eclass	15 Aug 2006 19:43:17 -0000	1.30
+++ db.eclass	8 Feb 2009 16:51:09 -0000
@@ -47,7 +47,7 @@
 
 	# do the same for headers now
 	# but since there are only two of them, just overwrite them
-	cd ${ROOT}/usr/include
+	cd "${ROOT}"/usr/include
 	target=`find . -maxdepth 1 -type d -name 'db[0-9]*' | sort -n |cut -d/ -f2- | tail -n1`
 	if [ -n "${target}" ] && [ -e "${target}/db.h" ] && ( ! [[ -e db.h ]] || [[ -h db.h ]] ); then
 		einfo "Creating db.h symlinks to ${target}"
@@ -67,25 +67,25 @@
 	# not everybody wants this wad of documentation as it is primarily API docs
 	if use doc; then
 		dodir /usr/share/doc/${PF}/html
-		mv ${D}/usr/docs/* ${D}/usr/share/doc/${PF}/html/
-		rm -rf ${D}/usr/docs
+		mv "${D}"/usr/docs/* "${D}"/usr/share/doc/${PF}/html/
+		rm -rf "${D}"/usr/docs
 	else
-		rm -rf ${D}/usr/docs
+		rm -rf "${D}"/usr/docs
 	fi
 }
 
 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}_}
+		mv "${fname}" "${fname//\/db_/\/db${SLOT}_}"
 	done
 }
 
 db_src_install_headerslot() {
 	# install all headers in a slotted location
 	dodir /usr/include/db${SLOT}
-	mv ${D}/usr/include/*.h ${D}/usr/include/db${SLOT}/
+	mv "${D}"/usr/include/*.h "${D}"/usr/include/db${SLOT}/
 }
 
 db_src_install_usrlibcleanup() {
@@ -97,22 +97,22 @@
 		die "Calling clean_links while \$D not defined"
 	fi
 
-	if [ -e ${LIB}/libdb.a ] && [ ! -e ${LIB}/libdb-${SLOT}.a ]; then
+	if [ -e "${LIB}"/libdb.a ] && [ ! -e "${LIB}"/libdb-${SLOT}.a ]; then
 		einfo "Moving libdb.a to a versioned name"
 		mv "${LIB}/libdb.a" "${LIB}/libdb-${SLOT}.a"
 	fi
 
-	if [ -e ${LIB}/libdb_cxx.a ] && [ ! -e ${LIB}/libdb_cxx-${SLOT}.a ]; then
+	if [ -e "${LIB}"/libdb_cxx.a ] && [ ! -e "${LIB}"/libdb_cxx-${SLOT}.a ]; then
 		einfo "Moving libdb_cxx.a to a versioned name"
 		mv "${LIB}/libdb_cxx.a" "${LIB}/libdb_cxx-${SLOT}.a"
 	fi
 
-	find ${LIB} -maxdepth 1 -type l -name 'libdb[1._-]*so' -exec rm \{} \;
-	find ${LIB} -maxdepth 1 -type l -name 'libdb[1._-]*so.[23]' -exec rm \{} \;
+	find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*so' -exec rm \{} \;
+	find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*so.[23]' -exec rm \{} \;
 	einfo "removing unversioned static archives"
-	find ${LIB} -maxdepth 1 -type l -name 'libdb[1._-]*a' -exec rm \{} \;
+	find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*a' -exec rm \{} \;
 
-	rm -f ${D}/usr/include/db.h ${D}/usr/include/db_185.h ${LIB}/libdb.a ${LIB}/libdb_cxx.a
+	rm -f "${D}"/usr/include/db.h "${D}"/usr/include/db_185.h ${LIB}/libdb.a ${LIB}/libdb_cxx.a
 }
 
 db_src_test() {
@@ -120,7 +120,7 @@
 		if useq tcl; then
 			einfo "Running sys-libs/db testsuite"
 			ewarn "This can take 6+ hours on modern machines"
-			cd ${S}
+			cd "${S}"
 			echo 'source ../test/test.tcl' >testrunner.tcl
 			echo 'run_std' >>testrunner.tcl
 			tclsh testrunner.tcl