Attachment #235397 for bug #318727

View | Details | Raw Unified | Return to bug 318727 | Differences between

and this patch




S="${WORKDIR}"/NX

pkg_preinst() {
	enewuser nx -1 -1 /var/lib/NX
}

src_prepare() {
	epatch "${FILESDIR}"/nxserver-3.0.0-r4-setup.patch
	epatch "${FILESDIR}"/nxserver-3.3.0-dontupdatekeys.patch
	epatch "${FILESDIR}"/nxserver-3.4-chown.patch
}

src_install() {

	into /usr/NX
	dobin bin/nxserver

	dodir /etc/NX/keys
	insinto /etc/NX
	doins etc/administrators.db.sample
	doins etc/guests.db.sample
	doins etc/passwords.db.sample


	newins etc/server-debian.cfg.sample server-gentoo.cfg.sample

	dodir /var/lib
	cp -R home/nx "${D}"/var/lib || die "Unable to install home folder"
	mv "${D}"/var/lib/{nx,NX}

	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"

	dodir /var/db/NX
	cp -R var/db/. "${D}"/var/db/NX || die "Unable to install var/db folder"
	dodir /var/run/NX
	cp -R var/run/. "${D}"/var/run/NX || die "Unable to install var/run folder"
	dodir /var/log/NX

	newinitd "${FILESDIR}"/nxserver-2.1.0-init nxserver
}

	# However they use different login shell/home directory paths
	if [[ ${ROOT} == "/" ]]; then
		usermod -s /usr/NX/bin/nxserver nx || die "Unable to set login shell of nx user!!"
		usermod -d /var/lib/NX nx || die "Unable to set home directory of nx user!!"
	else
		elog "If you had another NX server installed before, please make sure"
		elog "the nx user account is correctly set to:"
		elog " * login shell: /usr/NX/bin/nxserver"
		elog " * home directory: /var/lib/NX"
	fi

	# only run install when no configuration file is found
	if [ -f "${ROOT}"/etc/NX/server.cfg ]; then
		einfo "Running NoMachine's update script"
		"${ROOT}"/usr/NX/scripts/setup/nxserver --update || die "Update script failed"
	else

Return to bug 318727

Lines 28-39 Link Here

(-)/usr/portage/net-misc/nxserver-freeedition/nxserver-freeedition-3.4.0.12.ebuild (-8 / +17 lines)
28	S="${WORKDIR}"/NX	28	S="${WORKDIR}"/NX
29		29
30	pkg_preinst() {	30	pkg_preinst() {
31	enewuser nx -1 -1 /usr/NX/home/nx	31	enewuser nx -1 -1 /var/lib/NX
32	}	32	}
33		33
34	src_prepare() {	34	src_prepare() {
35	epatch "${FILESDIR}"/nxserver-3.0.0-r4-setup.patch	35	epatch "${FILESDIR}"/nxserver-3.0.0-r4-setup.patch
36	epatch "${FILESDIR}"/nxserver-3.3.0-dontupdatekeys.patch	36	epatch "${FILESDIR}"/nxserver-3.3.0-dontupdatekeys.patch
		37	epatch "${FILESDIR}"/nxserver-3.4-chown.patch
37	}	38	}
38		39
39	src_install() {	40	src_install() {
Lines 43-50 Link Here
43	into /usr/NX	44	into /usr/NX
44	dobin bin/nxserver	45	dobin bin/nxserver
45		46
46	dodir /usr/NX/etc/keys	47	dodir /etc/NX/keys
47	insinto /usr/NX/etc	48	insinto /etc/NX
48	doins etc/administrators.db.sample	49	doins etc/administrators.db.sample
49	doins etc/guests.db.sample	50	doins etc/guests.db.sample
50	doins etc/passwords.db.sample	51	doins etc/passwords.db.sample
Lines 54-64 Link Here
54		55
55	newins etc/server-debian.cfg.sample server-gentoo.cfg.sample	56	newins etc/server-debian.cfg.sample server-gentoo.cfg.sample
56		57
57	cp -R home "${D}"/usr/NX \|\| die "Unable to install home folder"	58	dodir /var/lib
		59	cp -R home/nx "${D}"/var/lib \|\| die "Unable to install home folder"
		60	mv "${D}"/var/lib/{nx,NX}
		61
58	cp -R lib "${D}"/usr/NX \|\| die "Unable to install lib folder"	62	cp -R lib "${D}"/usr/NX \|\| die "Unable to install lib folder"
59	cp -R scripts "${D}"/usr/NX \|\| die "Unable to install scripts folder"	63	cp -R scripts "${D}"/usr/NX \|\| die "Unable to install scripts folder"
60	cp -R share "${D}"/usr/NX \|\| die "Unable to install share folder"	64	cp -R share "${D}"/usr/NX \|\| die "Unable to install share folder"
61	cp -R var "${D}"/usr/NX \|\| die "Unable to install var folder"	65
		66	dodir /var/db/NX
		67	cp -R var/db/. "${D}"/var/db/NX \|\| die "Unable to install var/db folder"
		68	dodir /var/run/NX
		69	cp -R var/run/. "${D}"/var/run/NX \|\| die "Unable to install var/run folder"
		70	dodir /var/log/NX
62		71
63	newinitd "${FILESDIR}"/nxserver-2.1.0-init nxserver	72	newinitd "${FILESDIR}"/nxserver-2.1.0-init nxserver
64	}	73	}
Lines 68-83 Link Here
68	# However they use different login shell/home directory paths	77	# However they use different login shell/home directory paths
69	if [[ ${ROOT} == "/" ]]; then	78	if [[ ${ROOT} == "/" ]]; then
70	usermod -s /usr/NX/bin/nxserver nx \|\| die "Unable to set login shell of nx user!!"	79	usermod -s /usr/NX/bin/nxserver nx \|\| die "Unable to set login shell of nx user!!"
71	usermod -d /usr/NX/home/nx nx \|\| die "Unable to set home directory of nx user!!"	80	usermod -d /var/lib/NX nx \|\| die "Unable to set home directory of nx user!!"
72	else	81	else
73	elog "If you had another NX server installed before, please make sure"	82	elog "If you had another NX server installed before, please make sure"
74	elog "the nx user account is correctly set to:"	83	elog "the nx user account is correctly set to:"
75	elog " * login shell: /usr/NX/bin/nxserver"	84	elog " * login shell: /usr/NX/bin/nxserver"
76	elog " * home directory: /usr/NX/home/nx"	85	elog " * home directory: /var/lib/NX"
77	fi	86	fi
78		87
79	# only run install when no configuration file is found	88	# only run install when no configuration file is found
80	if [ -f /usr/NX/etc/server.cfg ]; then	89	if [ -f "${ROOT}"/etc/NX/server.cfg ]; then
81	einfo "Running NoMachine's update script"	90	einfo "Running NoMachine's update script"
82	"${ROOT}"/usr/NX/scripts/setup/nxserver --update \|\| die "Update script failed"	91	"${ROOT}"/usr/NX/scripts/setup/nxserver --update \|\| die "Update script failed"
83	else	92	else