Fix variable quoting. resin-3.0.22 will be removed soon, so it was not fixed.

(Portage version: 2.1.3.12)

4 files changed, 71 insertions, 67 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index debd30b5f5ab..7568220031eb 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/resin
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.54 2007/10/08 12:39:49 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.55 2007/10/08 12:51:15 nelchael Exp $
+
+  08 Oct 2007; Krzysiek Pawlik <nelchael@gentoo.org> resin-2.1.17.ebuild,
+  resin-3.0.24.ebuild, resin-3.1.2.ebuild:
+  Fix variable quoting.
 
   08 Oct 2007; Krzysiek Pawlik <nelchael@gentoo.org> resin-3.1.2.ebuild:
   Raise maximum memory to 384m, see bug #194860.
diff --git a/www-servers/resin/resin-2.1.17.ebuild b/www-servers/resin/resin-2.1.17.ebuild
index fc5fd382f9c1..c797f881648b 100644
--- a/www-servers/resin/resin-2.1.17.ebuild
+++ b/www-servers/resin/resin-2.1.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-2.1.17.ebuild,v 1.6 2007/04/21 20:49:17 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-2.1.17.ebuild,v 1.7 2007/10/08 12:51:15 nelchael Exp $
 
 inherit java-pkg eutils
 
@@ -17,20 +17,20 @@ IUSE=""
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}/${PN}.diff
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}/${PN}.diff"
 }
 
 pkg_preinst() {
 	enewgroup resin
 	enewuser resin -1 /bin/bash /opt/resin resin
-	chown -R resin:resin ${D}/opt/resin
-	chown -R resin:resin ${D}/var/log/${PN}
+	chown -R resin:resin "${D}/opt/resin"
+	chown -R resin:resin "${D}/var/log/${PN}"
 }
 src_compile() {	:; }
 
 src_install() {
-	cd ${S}
+	cd "${S}"
 	RESIN_HOME="/opt/resin"
 	diropts -m0755
 
@@ -57,7 +57,7 @@ src_install() {
 		contrib \
 		webapps \
 		xsl \
-	${D}${RESIN_HOME} || die
+	"${D}${RESIN_HOME}" || die
 	dosym /usr/share/${PN}/lib ${RESIN_HOME}/lib
 }
 
diff --git a/www-servers/resin/resin-3.0.24.ebuild b/www-servers/resin/resin-3.0.24.ebuild
index 60ce03ab5d94..9244a3a61d7a 100644
--- a/www-servers/resin/resin-3.0.24.ebuild
+++ b/www-servers/resin/resin-3.0.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.0.24.ebuild,v 1.3 2007/09/19 19:05:00 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.0.24.ebuild,v 1.4 2007/10/08 12:51:15 nelchael Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -54,22 +54,22 @@ src_compile() {
 
 	append-flags -fPIC -DPIC
 
-	chmod 755 ${S}/configure
+	chmod 755 "${S}/configure"
 	econf --prefix=${RESIN_HOME} || die "econf failed"
 
 	einfo "Building libraries..."
 	# Broken with -jn where n > 1
 	emake -j1 || die "emake failed"
 
-	mkdir ${S}/lib
-	cd ${S}/lib
+	mkdir "${S}/lib"
+	cd "${S}/lib"
 	java-pkg_jar-from sun-jaf
 	java-pkg_jar-from sun-javamail
 	java-pkg_jar-from iso-relax
 	java-pkg_jar-from aopalliance-1
 	java-pkg_jar-from resin-servlet-api-2.4
 	ln -s $(java-config --jdk-home)/lib/tools.jar
-	cd ${S}
+	cd "${S}"
 
 	einfo "Building jars..."
 	eant || die "ant failed"
@@ -83,10 +83,10 @@ src_compile() {
 
 src_install() {
 
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 
 	dodir /etc/
-	mv ${D}/${RESIN_HOME}/conf ${D}/etc/resin
+	mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin"
 	dosym /etc/resin ${RESIN_HOME}/conf
 
 	keepdir /var/log/resin
@@ -98,43 +98,43 @@ src_install() {
 
 	dodoc README
 
-	newinitd ${FILESDIR}/${PV}/resin.init resin
-	newconfd ${FILESDIR}/${PV}/resin.conf resin
+	newinitd "${FILESDIR}/${PV}/resin.init" resin
+	newconfd "${FILESDIR}/${PV}/resin.conf" resin
 
-	rm -f ${S}/lib/tools.jar
-	java-pkg_dojar ${S}/lib/*.jar
-	rm -fr ${D}/${RESIN_HOME}/lib
+	rm -f "${S}/lib/tools.jar"
+	java-pkg_dojar "${S}"/lib/*.jar
+	rm -fr "${D}/${RESIN_HOME}/lib"
 	dosym /usr/share/resin/lib ${RESIN_HOME}/lib
 
 	dodir /var/lib/resin/webapps
-	mv ${D}/${RESIN_HOME}/webapps/* ${D}/var/lib/resin/webapps
-	rm -rf ${D}/${RESIN_HOME}/webapps
+	mv "${D}"/${RESIN_HOME}/webapps/* "${D}/var/lib/resin/webapps"
+	rm -rf "${D}/${RESIN_HOME}/webapps"
 	dosym /var/lib/resin/webapps ${RESIN_HOME}/webapps
 
 	dosym /etc/resin/resin.conf /etc/resin/resin.xml
 
 	use source && {
 		einfo "Zipping source..."
-		java-pkg_dosrc ${S}/modules/*/src/* 2> /dev/null
+		java-pkg_dosrc "${S}"/modules/*/src/* 2> /dev/null
 	}
 
 	einfo "Removing unneeded files..."
-	rm -f ${D}/${RESIN_HOME}/bin/*.in
-	rm -f ${D}/etc/resin/*.orig
+	rm -f "${D}"/${RESIN_HOME}/bin/*.in
+	rm -f "${D}"/etc/resin/*.orig
 
 	einfo "Fixing permissions..."
-	chown -R resin:resin ${D}${RESIN_HOME}
-	chown -R resin:resin ${D}/etc/resin
-	chown -R resin:resin ${D}/var/log/resin
-	chown -R resin:resin ${D}/var/lib/resin
-	chown -R resin:resin ${D}/var/run/resin
-
-	chmod 755 ${D}${RESIN_HOME}/bin/*
-	chmod 644 ${D}/etc/conf.d/resin
-	chmod 755 ${D}/etc/init.d/resin
-	chmod 750 ${D}/var/lib/resin
-	chmod 750 ${D}/var/run/resin
-	chmod 750 ${D}/etc/resin
+	chown -R resin:resin "${D}${RESIN_HOME}"
+	chown -R resin:resin "${D}/etc/resin"
+	chown -R resin:resin "${D}/var/log/resin"
+	chown -R resin:resin "${D}/var/lib/resin"
+	chown -R resin:resin "${D}/var/run/resin"
+
+	chmod 755 "${D}${RESIN_HOME}"/bin/*
+	chmod 644 "${D}/etc/conf.d/resin"
+	chmod 755 "${D}/etc/init.d/resin"
+	chmod 750 "${D}/var/lib/resin"
+	chmod 750 "${D}/var/run/resin"
+	chmod 750 "${D}/etc/resin"
 
 }
 
diff --git a/www-servers/resin/resin-3.1.2.ebuild b/www-servers/resin/resin-3.1.2.ebuild
index ad64f023c76e..452f49c0add8 100644
--- a/www-servers/resin/resin-3.1.2.ebuild
+++ b/www-servers/resin/resin-3.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.2.ebuild,v 1.2 2007/10/08 12:39:49 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.2.ebuild,v 1.3 2007/10/08 12:51:15 nelchael Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -56,22 +56,22 @@ src_compile() {
 
 	append-flags -fPIC -DPIC
 
-	chmod 755 ${S}/configure
+	chmod 755 "${S}/configure"
 	econf --prefix=${RESIN_HOME} || die "econf failed"
 
 	einfo "Building libraries..."
 	# Broken with -jn where n > 1
 	emake -j1 || die "emake failed"
 
-	mkdir ${S}/lib
-	cd ${S}/lib
+	mkdir "${S}/lib"
+	cd "${S}/lib"
 	java-pkg_jar-from sun-jaf
 	java-pkg_jar-from sun-javamail
 	java-pkg_jar-from iso-relax
 	java-pkg_jar-from aopalliance-1
 	java-pkg_jar-from resin-servlet-api-2.5 resin-servlet-api.jar jsdk-15.jar
 	ln -s $(java-config --jdk-home)/lib/tools.jar
-	cd ${S}
+	cd "${S}"
 
 	einfo "Building jars..."
 	eant || die "ant failed"
@@ -85,10 +85,10 @@ src_compile() {
 
 src_install() {
 
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 
 	dodir /etc/
-	mv ${D}/${RESIN_HOME}/conf ${D}/etc/resin
+	mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin"
 	dosym /etc/resin ${RESIN_HOME}/conf
 
 	keepdir /var/log/resin
@@ -98,49 +98,49 @@ src_install() {
 	dosym /var/log/resin ${RESIN_HOME}/logs
 	dosym /var/log/resin ${RESIN_HOME}/log
 
-	dodoc README ${S}/conf/*.conf
+	dodoc README "${S}"/conf/*.conf
 
-	newinitd ${FILESDIR}/${PV}/resin.init resin
-	newconfd ${FILESDIR}/${PV}/resin.conf resin
+	newinitd "${FILESDIR}/${PV}/resin.init" resin
+	newconfd "${FILESDIR}/${PV}/resin.conf" resin
 
-	rm -f ${S}/lib/tools.jar
-	java-pkg_dojar ${S}/lib/*.jar
-	rm -fr ${D}/${RESIN_HOME}/lib
+	rm -f "${S}/lib/tools.jar"
+	java-pkg_dojar "${S}"/lib/*.jar
+	rm -fr "${D}/${RESIN_HOME}/lib"
 	dosym /usr/share/resin/lib ${RESIN_HOME}/lib
 	keepdir /usr/share/resin/log
 
 	dodir /var/lib/resin/webapps
-	mv ${D}/${RESIN_HOME}/webapps/* ${D}/var/lib/resin/webapps
-	rm -rf ${D}/${RESIN_HOME}/webapps
+	mv "${D}"/${RESIN_HOME}/webapps/* "${D}/var/lib/resin/webapps"
+	rm -rf "${D}/${RESIN_HOME}/webapps"
 	dosym /var/lib/resin/webapps ${RESIN_HOME}/webapps
 
 	dosym /etc/resin/resin.conf /etc/resin/resin.xml
 
 	use admin && {
-		cp -a ${S}/php ${D}/${RESIN_HOME}/ || die "cp failed"
+		cp -a "${S}/php" "${D}/${RESIN_HOME}/" || die "cp failed"
 	}
 
 	use source && {
 		einfo "Zipping source..."
-		java-pkg_dosrc ${S}/modules/*/src/* 2> /dev/null
+		java-pkg_dosrc "${S}"/modules/*/src/* 2> /dev/null
 	}
 
 	einfo "Removing unneeded files..."
-	rm -fr ${D}/${RESIN_HOME}/bin
-	rm -f ${D}/etc/resin/*.orig
+	rm -fr "${D}/${RESIN_HOME}/bin"
+	rm -f "${D}"/etc/resin/*.orig
 
 	einfo "Fixing permissions..."
-	chown -R resin:resin ${D}${RESIN_HOME}
-	chown -R resin:resin ${D}/etc/resin
-	chown -R resin:resin ${D}/var/log/resin
-	chown -R resin:resin ${D}/var/lib/resin
-	chown -R resin:resin ${D}/var/run/resin
-
-	chmod 644 ${D}/etc/conf.d/resin
-	chmod 755 ${D}/etc/init.d/resin
-	chmod 750 ${D}/var/lib/resin
-	chmod 750 ${D}/var/run/resin
-	chmod 750 ${D}/etc/resin
+	chown -R resin:resin "${D}${RESIN_HOME}"
+	chown -R resin:resin "${D}/etc/resin"
+	chown -R resin:resin "${D}/var/log/resin"
+	chown -R resin:resin "${D}/var/lib/resin"
+	chown -R resin:resin "${D}/var/run/resin"
+
+	chmod 644 "${D}/etc/conf.d/resin"
+	chmod 755 "${D}/etc/init.d/resin"
+	chmod 750 "${D}/var/lib/resin"
+	chmod 750 "${D}/var/run/resin"
+	chmod 750 "${D}/etc/resin"
 
 }