Fix quoting, bug #168723

(Portage version: 2.1.2-r12)

2 files changed, 21 insertions, 18 deletions

diff --git a/games-strategy/dominions2/ChangeLog b/games-strategy/dominions2/ChangeLog
index e0e226372ed3..5386da43ad24 100644
--- a/games-strategy/dominions2/ChangeLog
+++ b/games-strategy/dominions2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/dominions2
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2/ChangeLog,v 1.5 2007/02/21 23:59:56 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2/ChangeLog,v 1.6 2007/02/28 14:37:24 nyhm Exp $
+
+  28 Feb 2007; Tristan Heaven <nyhm@gentoo.org> dominions2-2.16.ebuild:
+  Fix quoting, bug #168723
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/games-strategy/dominions2/dominions2-2.16.ebuild b/games-strategy/dominions2/dominions2-2.16.ebuild
index b7b510246708..b0312f866e54 100644
--- a/games-strategy/dominions2/dominions2-2.16.ebuild
+++ b/games-strategy/dominions2/dominions2-2.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2/dominions2-2.16.ebuild,v 1.5 2006/03/31 22:09:39 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2/dominions2-2.16.ebuild,v 1.6 2007/02/28 14:37:24 nyhm Exp $
 
 inherit eutils games
 
@@ -32,12 +32,12 @@ DEPEND="virtual/opengl
 	amd64? ( app-emulation/emul-linux-x86-xlibs
 		app-emulation/emul-linux-x86-sdl )"
 
-dir="${GAMES_PREFIX_OPT}/${PN}"
-Ddir="${D}/${dir}"
+dir=${GAMES_PREFIX_OPT}/${PN}
+Ddir=${D}/${dir}
 
 src_unpack() {
-	mkdir -p ${S}/patch
-	cd ${S}/patch
+	mkdir -p "${S}"/patch
+	cd "${S}"/patch
 	if use x86 || use amd64
 	then
 		unpack dompatch${PV/\./}_linux_x86.tgz
@@ -54,23 +54,23 @@ src_install() {
 	exeinto "${dir}"
 	if use amd64 || use x86
 	then
-		doexe ${CDROM_ROOT}/bin_lin/x86/dom2* || die "doexe failed"
+		doexe "${CDROM_ROOT}"/bin_lin/x86/dom2* || die "doexe failed"
 	elif use ppc
 	then
-		doexe ${CDROM_ROOT}/bin_lin/ppc/dom2* || die "doexe failed"
+		doexe "${CDROM_ROOT}"/bin_lin/ppc/dom2* || die "doexe failed"
 	fi
 	insinto "${dir}"
-	doins -r ${CDROM_ROOT}/dominions2.app/Contents/Resources/* || \
+	doins -r "${CDROM_ROOT}"/dominions2.app/Contents/Resources/* || \
 		die "doins failed"
-	dodoc ${CDROM_ROOT}/doc/* || die "dodoc failed"
+	dodoc "${CDROM_ROOT}"/doc/* || die "dodoc failed"
 
 	# applying the official patches just means overwriting some important
 	# files with their more recent versions:
 	einfo "Applying patch for version ${PV}..."
-	dodoc ${S}/patch/doc/* || die "dodoc failed"
-	doexe ${S}/patch/dom2 || die "doexe failed"
-	rm -rf ${S}/patch/doc/ ${S}/patch/dom2 || die "rm failed"
-	doins -r ${S}/patch/* || die "doins failed"
+	dodoc "${S}"/patch/doc/* || die "dodoc failed"
+	doexe "${S}"/patch/dom2 || die "doexe failed"
+	rm -rf "${S}"/patch/doc/ "${S}"/patch/dom2 || die "rm failed"
+	doins -r "${S}"/patch/* || die "doins failed"
 
 	if use doc; then
 		einfo ""
@@ -79,13 +79,13 @@ src_install() {
 		einfo "You may want to study 'DOM2_Walkthrough.pdf' carefully if"
 		einfo "you are new to Dominions II."
 		einfo ""
-		dodoc ${DISTDIR}/{DOM2_Walkthrough,manual_addenda}.pdf
+		dodoc "${DISTDIR}"/{DOM2_Walkthrough,manual_addenda}.pdf
 	fi
 
-	doicon ${DISTFILES}/${PN}.png
+	doicon "${DISTDIR}"/${PN}.png
 
 	# update times
-	find ${D} -exec touch '{}' \;
+	find "${D}" -exec touch '{}' \;
 
 	games_make_wrapper dominions2 ./dom2 "${dir}" "${dir}"
 	make_desktop_entry dominions2 "Dominions II" dominions2.png