Fix variables quoting, clean up install part

Package-Manager: portage-2.1.3.9

3 files changed, 26 insertions, 26 deletions

diff --git a/net-misc/nxserver-freeedition/ChangeLog b/net-misc/nxserver-freeedition/ChangeLog
index 88cd6a6595c4..6fd47feb8bd7 100644
--- a/net-misc/nxserver-freeedition/ChangeLog
+++ b/net-misc/nxserver-freeedition/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/nxserver-freeedition
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog,v 1.13 2007/09/18 21:01:47 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog,v 1.14 2007/09/18 21:52:53 voyageur Exp $
+
+  18 Sep 2007; Bernard Cafarelli <voyageur@gentoo.org>
+  nxserver-freeedition-3.0.0-r3.ebuild:
+  Fix variables quoting, thanks opfer
+  Also clean up the install section
 
 *nxserver-freeedition-3.0.0-r3 (18 Sep 2007)
 
diff --git a/net-misc/nxserver-freeedition/Manifest b/net-misc/nxserver-freeedition/Manifest
index 075ef2c4b59d..2f5d7f93e350 100644
--- a/net-misc/nxserver-freeedition/Manifest
+++ b/net-misc/nxserver-freeedition/Manifest
@@ -27,14 +27,14 @@ EBUILD nxserver-freeedition-3.0.0-r2.ebuild 2226 RMD160 a07e3480dbb797637b46138c
 MD5 4ed1a8348a853fed9d41652b73bb3b4e nxserver-freeedition-3.0.0-r2.ebuild 2226
 RMD160 a07e3480dbb797637b46138c878bc06503ed3180 nxserver-freeedition-3.0.0-r2.ebuild 2226
 SHA256 76e669b5c7b8d4b19b13080d4adec2680cc6f5cbe18a1ff88eab9d9e3e66a2bc nxserver-freeedition-3.0.0-r2.ebuild 2226
-EBUILD nxserver-freeedition-3.0.0-r3.ebuild 2229 RMD160 4c8206049876913d8a39b9c0a378bb716e588007 SHA1 7a4a3abefe9fa2918de117f206536a523bcf5eaf SHA256 e473da9cebcff97161d90277d39c130cbd85854d8c468332ba8de92678c1aab7
-MD5 f3433618e802d6e056ef1f46092b3493 nxserver-freeedition-3.0.0-r3.ebuild 2229
-RMD160 4c8206049876913d8a39b9c0a378bb716e588007 nxserver-freeedition-3.0.0-r3.ebuild 2229
-SHA256 e473da9cebcff97161d90277d39c130cbd85854d8c468332ba8de92678c1aab7 nxserver-freeedition-3.0.0-r3.ebuild 2229
-MISC ChangeLog 2444 RMD160 d75ed2b944eb90fc3bb0b0a67bd590e12de56b04 SHA1 c54ec53f0cad0b654f3dd2ebc44e1afb2450de9c SHA256 d2d95173fe7c881f50300678828ce8eb694ab0769d661f41d864e031761fd0bf
-MD5 c6b5177d74ca626d87a8774e8f5fcdb6 ChangeLog 2444
-RMD160 d75ed2b944eb90fc3bb0b0a67bd590e12de56b04 ChangeLog 2444
-SHA256 d2d95173fe7c881f50300678828ce8eb694ab0769d661f41d864e031761fd0bf ChangeLog 2444
+EBUILD nxserver-freeedition-3.0.0-r3.ebuild 2196 RMD160 46e96b3d9b21b0d683e2221982b0b08d303a59f0 SHA1 c6ed426de1b0f1edee22d6978fc267276147d045 SHA256 23e0646db2b04553af94425590e3a2ef1690ffbd8d8191db06cd34d969cb184e
+MD5 d1e7023784d98cb203b9d98eadc5e049 nxserver-freeedition-3.0.0-r3.ebuild 2196
+RMD160 46e96b3d9b21b0d683e2221982b0b08d303a59f0 nxserver-freeedition-3.0.0-r3.ebuild 2196
+SHA256 23e0646db2b04553af94425590e3a2ef1690ffbd8d8191db06cd34d969cb184e nxserver-freeedition-3.0.0-r3.ebuild 2196
+MISC ChangeLog 2614 RMD160 949fe9cc107ca02beda6e1246543407285cf8999 SHA1 c389d505796229c196d529e7b0744b3830de4fbe SHA256 391c92a5f6f201de0d37d0fae712d917d7b974a93a272fee64570c2fa043a372
+MD5 523652fd8ea4fdf040786bcbc06067e3 ChangeLog 2614
+RMD160 949fe9cc107ca02beda6e1246543407285cf8999 ChangeLog 2614
+SHA256 391c92a5f6f201de0d37d0fae712d917d7b974a93a272fee64570c2fa043a372 ChangeLog 2614
 MISC metadata.xml 229 RMD160 36b4bf7d904838e36addc9c65e276eba42746844 SHA1 713c86b664acaa5ddaa5551907f76eb0ea9209d3 SHA256 445516ce54a07930b5cf708034023dddbc5fd8125be710709912ef849e623bc5
 MD5 e5d85b3407fdd88a70d92ac5e68db1a5 metadata.xml 229
 RMD160 36b4bf7d904838e36addc9c65e276eba42746844 metadata.xml 229
diff --git a/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0-r3.ebuild b/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0-r3.ebuild
index 27741e3204db..fa44f4a59596 100644
--- a/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0-r3.ebuild
+++ b/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0-r3.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/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0-r3.ebuild,v 1.1 2007/09/18 21:01:47 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0-r3.ebuild,v 1.2 2007/09/18 21:52:53 voyageur Exp $
 
 inherit eutils
 
@@ -33,8 +33,8 @@ pkg_preinst()
 src_unpack()
 {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/nxserver-3.0.0-r3-setup.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/nxserver-3.0.0-r3-setup.patch
 }
 
 src_install()
@@ -43,11 +43,9 @@ src_install()
 	# with libraries installed for FreeNX
 
 	into /usr/NX
-	for x in nxserver ; do
-		dobin bin/$x
-	done
+	dobin bin/nxserver
 
-	dodir /usr/NX/etc
+	dodir /usr/NX/etc/keys
 	insinto /usr/NX/etc
 	doins etc/administrators.db.sample
 	doins etc/guests.db.sample
@@ -58,15 +56,12 @@ src_install()
 
 	newins etc/server-debian.cfg.sample server-gentoo.cfg.sample
 
-	cp -R etc/keys ${D}/usr/NX/etc || die
+	insinto /usr/NX
+	doins -r home lib scripts
+	cp -R share "${D}"/usr/NX || die "Unable to install share folder"
+	cp -R var "${D}"/usr/NX || die "Unable to install var folder"
 
-	cp -R home ${D}/usr/NX || die
-	cp -R lib ${D}/usr/NX || die
-	cp -R scripts ${D}/usr/NX || die
-	cp -R share ${D}/usr/NX || die
-	cp -R var ${D}/usr/NX || die
-
-	newinitd ${FILESDIR}/nxserver-2.1.0-init nxserver
+	newinitd "${FILESDIR}"/nxserver-2.1.0-init nxserver
 }
 
 pkg_postinst ()
@@ -77,10 +72,10 @@ pkg_postinst ()
 	# only run install when no configuration file is found
 	if [ -f /usr/NX/etc/server.cfg ]; then
 		einfo "Running NoMachine's update script"
-		${ROOT}/usr/NX/scripts/setup/nxserver --update
+		"${ROOT}"/usr/NX/scripts/setup/nxserver --update
 	else
 		einfo "Running NoMachine's setup script"
-		${ROOT}/usr/NX/scripts/setup/nxserver --install
+		"${ROOT}"/usr/NX/scripts/setup/nxserver --install
 	fi
 
 	elog "Remember to add nxserver to your default runlevel"