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

[Nirbheek Chauhan (nirbheek)]

nirbheek    09/05/01 21:50:44

  Modified:             nsplugins.eclass
  Log:
  Fix quoting issues, patch by maekke -- bug 258217

Revision  Changes    Path
1.23                 eclass/nsplugins.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/nsplugins.eclass?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/nsplugins.eclass?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/nsplugins.eclass?r1=1.22&r2=1.23

Index: nsplugins.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/nsplugins.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- nsplugins.eclass	4 Aug 2005 21:55:06 -0000	1.22
+++ nsplugins.eclass	1 May 2009 21:50:44 -0000	1.23
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/nsplugins.eclass,v 1.22 2005/08/04 21:55:06 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/nsplugins.eclass,v 1.23 2009/05/01 21:50:44 nirbheek Exp $
 #
 # Author: Martin Schlemmer <azarah@g.o>
 #
@@ -20,8 +20,8 @@
 	# Move plugins dir.  We use keepdir so that it might not be unmerged
 	# by mistake ...
 	keepdir /usr/$(get_libdir)/${PLUGINS_DIR}
-	cp -a ${D}/$1/* ${D}/usr/$(get_libdir)/${PLUGINS_DIR}
-	rm -rf ${D}/$1
+	cp -a "${D}"/$1/* "${D}"/usr/$(get_libdir)/${PLUGINS_DIR}
+	rm -rf "${D}"/$1
 	dosym /usr/$(get_libdir)/${PLUGINS_DIR} $1
 }
 
@@ -31,11 +31,11 @@
 pkg_mv_plugins() {
 
 	# Move old plugins dir
-	if [ -d "${ROOT}/$1" -a ! -L "${ROOT}/$1" ]
+	if [[ -d "${ROOT}/$1" -a ! -L "${ROOT}/$1" ]]
 	then
-		mkdir -p ${ROOT}/usr/$(get_libdir)/${PLUGINS_DIR}
-		cp -a ${ROOT}/$1/* ${ROOT}/usr/$(get_libdir)/${PLUGINS_DIR}
-		rm -rf ${ROOT}/$1
+		mkdir -p "${ROOT}"/usr/$(get_libdir)/${PLUGINS_DIR}
+		cp -a "${ROOT}"/$1/* "${ROOT}"/usr/$(get_libdir)/${PLUGINS_DIR}
+		rm -rf "${ROOT}"/$1
 	fi
 }