QA fixes; unquoted variables

(Portage version: 2.2_rc45/cvs/Linux x86_64)

4 files changed, 53 insertions, 49 deletions

diff --git a/app-admin/tripwire/ChangeLog b/app-admin/tripwire/ChangeLog
index ec1ec36ee0cd..272e9cc82efd 100644
--- a/app-admin/tripwire/ChangeLog
+++ b/app-admin/tripwire/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/tripwire
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/ChangeLog,v 1.30 2009/09/23 15:02:59 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/ChangeLog,v 1.31 2009/10/11 23:59:13 halcy0n Exp $
+
+  11 Oct 2009; Mark Loeser <halcy0n@gentoo.org> tripwire-2.3.1.2-r1.ebuild,
+  tripwire-2.3.1.2-r2.ebuild, tripwire-2.4.1.2.ebuild:
+  QA fixes; unquoted variables
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org>
   tripwire-2.3.1.2-r1.ebuild, tripwire-2.3.1.2-r2.ebuild,
diff --git a/app-admin/tripwire/tripwire-2.3.1.2-r1.ebuild b/app-admin/tripwire/tripwire-2.3.1.2-r1.ebuild
index 795e54667dca..1a22a7876ef3 100644
--- a/app-admin/tripwire/tripwire-2.3.1.2-r1.ebuild
+++ b/app-admin/tripwire/tripwire-2.3.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/tripwire-2.3.1.2-r1.ebuild,v 1.14 2009/09/23 15:02:59 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/tripwire-2.3.1.2-r1.ebuild,v 1.15 2009/10/11 23:59:13 halcy0n Exp $
 
 inherit eutils flag-o-matic
 
@@ -24,38 +24,38 @@ RDEPEND="virtual/cron
 	virtual/mta
 	dev-libs/openssl"
 
-S=${WORKDIR}/tripwire-${TW_VER}
+S="${WORKDIR}"/tripwire-${TW_VER}
 
 src_unpack() {
 	# unpack tripwire source tarball
 	unpack tripwire-${TW_VER}.tar.gz
 	unpack twpol.txt.gz
-	cd ${S}
+	cd "${S}"
 
 	# some patches ive collected/made for tripwire
 	# mostly from mandrake, some from other sources
-	epatch ${FILESDIR}/tripwire-2.3.0-50-rfc822.patch
-	epatch ${FILESDIR}/tripwire-2.3.1-2-fhs.patch
-	epatch ${FILESDIR}/tripwire-2.3.1-2-gcc-3.3.patch
-	epatch ${FILESDIR}/tripwire-2.3.1-gcc3.patch
-	epatch ${FILESDIR}/tripwire-jbj.patch
-	epatch ${FILESDIR}/tripwire-mkstemp.patch
+	epatch "${FILESDIR}"/tripwire-2.3.0-50-rfc822.patch
+	epatch "${FILESDIR}"/tripwire-2.3.1-2-fhs.patch
+	epatch "${FILESDIR}"/tripwire-2.3.1-2-gcc-3.3.patch
+	epatch "${FILESDIR}"/tripwire-2.3.1-gcc3.patch
+	epatch "${FILESDIR}"/tripwire-jbj.patch
+	epatch "${FILESDIR}"/tripwire-mkstemp.patch
 
 	# pull out the interesting debian patches
 	filterdiff  -i '*/man/man8/twadmin.8' -z  --strip=1	\
-		${DISTDIR}/tripwire_2.3.1.2-6.1.diff.gz > ${T}/debian-patch.diff
-	epatch ${T}/debian-patch.diff
+		"${DISTDIR}"/tripwire_2.3.1.2-6.1.diff.gz > "${T}"/debian-patch.diff
+	epatch "${T}"/debian-patch.diff
 
 	# cleanup ready for build
-	rm -rf ${S}/src/STLport*
-	touch ${S}/src/STLport_r ${S}/src/STLport_d
+	rm -rf "${S}"/src/STLport*
+	touch "${S}"/src/STLport_r "${S}"/src/STLport_d
 
 	# security fix, http://www.securityfocus.com/archive/1/365036
-	epatch ${FILESDIR}/tripwire-format-string-email-report.diff
+	epatch "${FILESDIR}"/tripwire-format-string-email-report.diff
 }
 
 src_compile() {
-	cd ${S}/src
+	cd "${S}"/src
 
 	# tripwire can be sensitive to compiler optimisation.
 	# see #32613, #45823, and others.
@@ -66,29 +66,29 @@ src_compile() {
 }
 
 src_install() {
-	dosbin ${S}/bin/*/{tripwire,twadmin,twprint} || die
+	dosbin "${S}"/bin/*/{tripwire,twadmin,twprint} || die
 
 	for i in {4,5,8}
 	do
-		cd ${S}/man/man${i}
+		cd "${S}"/man/man${i}
 		doman *.$i
-		cd ${S}
+		cd "${S}"
 	done
 
 	dodir /etc/tripwire
 	dodir /var/lib/tripwire/report
 
 	exeinto /etc/cron.daily
-	doexe ${FILESDIR}/tripwire.cron
+	doexe "${FILESDIR}"/tripwire.cron
 
 	dodoc README Release_Notes ChangeLog policy/policyguide.txt TRADEMARK \
-		${WORKDIR}/tripwire.gif ${FILESDIR}/tripwire.txt
+		"${WORKDIR}"/tripwire.gif "${FILESDIR}"/tripwire.txt
 
 	insinto /etc/tripwire
-	doins ${WORKDIR}/twpol.txt ${FILESDIR}/twcfg.txt
+	doins "${WORKDIR}"/twpol.txt "${FILESDIR}"/twcfg.txt
 
 	exeinto /etc/tripwire
-	doexe ${FILESDIR}/twinstall.sh
+	doexe "${FILESDIR}"/twinstall.sh
 
 	fperms 755 /etc/tripwire/twinstall.sh /etc/cron.daily/tripwire.cron
 }
diff --git a/app-admin/tripwire/tripwire-2.3.1.2-r2.ebuild b/app-admin/tripwire/tripwire-2.3.1.2-r2.ebuild
index 2912ae0efc49..45b7f990ed54 100644
--- a/app-admin/tripwire/tripwire-2.3.1.2-r2.ebuild
+++ b/app-admin/tripwire/tripwire-2.3.1.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/tripwire-2.3.1.2-r2.ebuild,v 1.14 2009/09/23 15:02:59 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/tripwire-2.3.1.2-r2.ebuild,v 1.15 2009/10/11 23:59:13 halcy0n Exp $
 
 inherit eutils flag-o-matic autotools
 
@@ -25,21 +25,21 @@ RDEPEND="virtual/cron
 	virtual/mta
 	ssl? ( dev-libs/openssl )"
 
-S=${WORKDIR}/tripwire-${TW_VER}
+S="${WORKDIR}"/tripwire-${TW_VER}
 
 src_unpack() {
 	# unpack tripwire source tarball
 	unpack tripwire-${TW_VER}.tar.gz
 	unpack twpol.txt.gz
-	cd ${S}
+	cd "${S}"
 
 	# Paul Herman has been maintaining some updates to tripwire
 	# including autoconf support and portability fixes.
 	# http://www.frenchfries.net/paul/tripwire/
 	export EPATCH_OPTS="-F3 -l"
-	epatch ${FILESDIR}/tripwire-friend-classes.patch
-	epatch ${DISTDIR}/tripwire-2.3.1-2-pherman-portability-0.9.diff.bz2
-	epatch ${FILESDIR}/tripwire-2.3.0-50-rfc822.patch
+	epatch "${FILESDIR}"/tripwire-friend-classes.patch
+	epatch "${DISTDIR}"/tripwire-2.3.1-2-pherman-portability-0.9.diff.bz2
+	epatch "${FILESDIR}"/tripwire-2.3.0-50-rfc822.patch
 
 	eautoreconf || die "eautoreconf failed"
 }
@@ -52,7 +52,7 @@ src_compile() {
 	append-flags -DCONFIG_DIR='"\"/etc/tripwire\""' -fno-strict-aliasing
 
 		ebegin "	Preparing Directory"
-			mkdir ${S}/lib ${S}/bin || die
+			mkdir "${S}"/lib "${S}"/bin || die
 		eend
 	einfo "Done."
 	chmod +x configure
@@ -61,22 +61,22 @@ src_compile() {
 }
 
 src_install() {
-	dosbin ${S}/bin/{siggen,tripwire,twadmin,twprint}
-	doman ${S}/man/man{4/*.4,5/*.5,8/*.8}
+	dosbin "${S}"/bin/{siggen,tripwire,twadmin,twprint}
+	doman "${S}"/man/man{4/*.4,5/*.5,8/*.8}
 	dodir /etc/tripwire /var/lib/tripwire{,/report}
 	keepdir /var/lib/tripwire{,/report}
 
 	exeinto /etc/cron.daily
-	doexe ${FILESDIR}/tripwire.cron
+	doexe "${FILESDIR}"/tripwire.cron
 
 	dodoc README Release_Notes ChangeLog policy/policyguide.txt TRADEMARK \
-		${WORKDIR}/tripwire.gif ${FILESDIR}/tripwire.txt
+		"${WORKDIR}"/tripwire.gif "${FILESDIR}"/tripwire.txt
 
 	insinto /etc/tripwire
-	doins ${WORKDIR}/twpol.txt ${FILESDIR}/twcfg.txt
+	doins "${WORKDIR}"/twpol.txt "${FILESDIR}"/twcfg.txt
 
 	exeinto /etc/tripwire
-	doexe ${FILESDIR}/twinstall.sh
+	doexe "${FILESDIR}"/twinstall.sh
 
 	fperms 755 /etc/tripwire/twinstall.sh /etc/cron.daily/tripwire.cron
 }
diff --git a/app-admin/tripwire/tripwire-2.4.1.2.ebuild b/app-admin/tripwire/tripwire-2.4.1.2.ebuild
index b73b182a92d3..1818040c33fb 100644
--- a/app-admin/tripwire/tripwire-2.4.1.2.ebuild
+++ b/app-admin/tripwire/tripwire-2.4.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/tripwire-2.4.1.2.ebuild,v 1.3 2009/09/23 15:02:59 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/tripwire-2.4.1.2.ebuild,v 1.4 2009/10/11 23:59:13 halcy0n Exp $
 
 inherit eutils flag-o-matic autotools
 
@@ -25,21 +25,21 @@ RDEPEND="virtual/cron
 	virtual/mta
 	ssl? ( dev-libs/openssl )"
 
-S=${WORKDIR}/tripwire-${TW_VER}
+S="${WORKDIR}"/tripwire-${TW_VER}
 
 src_unpack() {
 	# unpack tripwire source tarball
 	unpack tripwire-${TW_VER}.tar.gz
 	unpack twpol.txt.gz
-	cd ${S}
+	cd "${S}"
 
 	# Paul Herman has been maintaining some updates to tripwire
 	# including autoconf support and portability fixes.
 	# http://www.frenchfries.net/paul/tripwire/
 	export EPATCH_OPTS="-F3 -l"
-	epatch ${FILESDIR}/tripwire-friend-classes.patch
-	epatch ${DISTDIR}/tripwire-2.3.1-2-pherman-portability-0.9.diff.bz2
-	epatch ${FILESDIR}/tripwire-2.3.0-50-rfc822.patch
+	epatch "${FILESDIR}"/tripwire-friend-classes.patch
+	epatch "${DISTDIR}"/tripwire-2.3.1-2-pherman-portability-0.9.diff.bz2
+	epatch "${FILESDIR}"/tripwire-2.3.0-50-rfc822.patch
 
 	eautoreconf || die "eautoreconf failed"
 }
@@ -52,7 +52,7 @@ src_compile() {
 	append-flags -DCONFIG_DIR='"\"/etc/tripwire\""' -fno-strict-aliasing
 
 		ebegin "	Preparing Directory"
-			mkdir ${S}/lib ${S}/bin || die
+			mkdir "${S}"/lib "${S}"/bin || die
 		eend
 	einfo "Done."
 	chmod +x configure
@@ -61,22 +61,22 @@ src_compile() {
 }
 
 src_install() {
-	dosbin ${S}/bin/{siggen,tripwire,twadmin,twprint}
-	doman ${S}/man/man{4/*.4,5/*.5,8/*.8}
+	dosbin "${S}"/bin/{siggen,tripwire,twadmin,twprint}
+	doman "${S}"/man/man{4/*.4,5/*.5,8/*.8}
 	dodir /etc/tripwire /var/lib/tripwire{,/report}
 	keepdir /var/lib/tripwire{,/report}
 
 	exeinto /etc/cron.daily
-	doexe ${FILESDIR}/tripwire.cron
+	doexe "${FILESDIR}"/tripwire.cron
 
 	dodoc README Release_Notes ChangeLog policy/policyguide.txt TRADEMARK \
-		${FILESDIR}/tripwire.txt
+		"${FILESDIR}"/tripwire.txt
 
 	insinto /etc/tripwire
-	doins ${WORKDIR}/twpol.txt ${FILESDIR}/twcfg.txt
+	doins "${WORKDIR}"/twpol.txt "${FILESDIR}"/twcfg.txt
 
 	exeinto /etc/tripwire
-	doexe ${FILESDIR}/twinstall.sh
+	doexe "${FILESDIR}"/twinstall.sh
 
 	fperms 755 /etc/tripwire/twinstall.sh /etc/cron.daily/tripwire.cron
 }