Fix files installation mode, added check on postinst

Package-Manager: portage-2.1.3.9

3 files changed, 19 insertions, 14 deletions

diff --git a/net-misc/nxserver-freeedition/ChangeLog b/net-misc/nxserver-freeedition/ChangeLog
index 6fd47feb8bd7..927fc815c537 100644
--- a/net-misc/nxserver-freeedition/ChangeLog
+++ b/net-misc/nxserver-freeedition/ChangeLog
@@ -1,6 +1,10 @@
 # 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.14 2007/09/18 21:52:53 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog,v 1.15 2007/09/19 14:51:03 voyageur Exp $
+
+  19 Sep 2007; Bernard Cafarelli <voyageur@gentoo.org>
+  nxserver-freeedition-3.0.0-r3.ebuild:
+  Fix files installation mode, added check on postinst
 
   18 Sep 2007; Bernard Cafarelli <voyageur@gentoo.org>
   nxserver-freeedition-3.0.0-r3.ebuild:
diff --git a/net-misc/nxserver-freeedition/Manifest b/net-misc/nxserver-freeedition/Manifest
index 2f5d7f93e350..278042d63002 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 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
+EBUILD nxserver-freeedition-3.0.0-r3.ebuild 2411 RMD160 aa134d7d8a344b298fbaddd8fd3d93f3c5d99432 SHA1 a90c636ee8f1f6e95d6a787548f635e21c46417d SHA256 ac970efd4a06c09eef8630f01f7508d8bface72f4820b4c503031b28e3b47e28
+MD5 8126edaa922cdc1bef5446a6d0e4a44b nxserver-freeedition-3.0.0-r3.ebuild 2411
+RMD160 aa134d7d8a344b298fbaddd8fd3d93f3c5d99432 nxserver-freeedition-3.0.0-r3.ebuild 2411
+SHA256 ac970efd4a06c09eef8630f01f7508d8bface72f4820b4c503031b28e3b47e28 nxserver-freeedition-3.0.0-r3.ebuild 2411
+MISC ChangeLog 2765 RMD160 a0292a1be144e51ca682792cce2defc024f68b25 SHA1 9f813f430125867587ccf9c4d0ed3af0183f3710 SHA256 2758364eb1aa3d3052eca69be3a478ca53d1ed2679f497abccc580977400b7ba
+MD5 aed57bc4b858eec4f253c31274508f12 ChangeLog 2765
+RMD160 a0292a1be144e51ca682792cce2defc024f68b25 ChangeLog 2765
+SHA256 2758364eb1aa3d3052eca69be3a478ca53d1ed2679f497abccc580977400b7ba ChangeLog 2765
 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 fa44f4a59596..31e9768a11cb 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.2 2007/09/18 21:52:53 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0-r3.ebuild,v 1.3 2007/09/19 14:51:03 voyageur Exp $
 
 inherit eutils
 
@@ -56,8 +56,9 @@ src_install()
 
 	newins etc/server-debian.cfg.sample server-gentoo.cfg.sample
 
-	insinto /usr/NX
-	doins -r home lib scripts
+	cp -R home ${D}/usr/NX || die "Unable to install home folder"
+	cp -R lib ${D}/usr/NX || die "Unable to install lib folder"
+	cp -R scripts ${D}/usr/NX || die "Unable to install scripts folder"
 	cp -R share "${D}"/usr/NX || die "Unable to install share folder"
 	cp -R var "${D}"/usr/NX || die "Unable to install var folder"
 
@@ -72,10 +73,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 || die "Update script failed"
 	else
 		einfo "Running NoMachine's setup script"
-		"${ROOT}"/usr/NX/scripts/setup/nxserver --install
+		"${ROOT}"/usr/NX/scripts/setup/nxserver --install || die "Installation script failed"
 	fi
 
 	elog "Remember to add nxserver to your default runlevel"