Attachment #251235 for bug #318727

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

and this patch





S=${WORKDIR}/NX

move_dir()
{
	if [[ -e $1 && ! -L $1 ]] ; then
		mkdir -p $2
		mv $1/* $2/
		rm -rf $1
	fi
}

pkg_setup() {
	if [ -d ${ROOT}/usr/NX/etc \
	    -o -d ${ROOT}/usr/NX/var \
	    -o -d ${ROOT}/usr/NX/home ]; then
		ewarn
		ewarn "Collisions are expected here."
		ewarn "Use COLLISION_IGNORE=\"/usr/NX/var /usr/NX/home\" emerge ... for this package,"
		ewarn "or remove previous versions of nxnode and nxserver-freeedition first."
		ewarn
	fi
}

pkg_preinst()
{
	enewuser nx -1 -1 /var/lib/NX
	move_dir ${ROOT}/usr/NX/etc ${ROOT}/etc/NX
	move_dir ${ROOT}/usr/NX/var/db ${ROOT}/var/db/NX
	move_dir ${ROOT}/usr/NX/home/nx ${ROOT}/var/lib/NX
	move_dir ${ROOT}/usr/NX/var/log ${ROOT}/var/log/NX
	move_dir ${ROOT}/usr/NX/var/run ${ROOT}/var/run/NX
}

src_prepare()

		dobin bin/$x
	done

	dodir /etc/NX
	dosym /etc/NX /usr/NX/etc
	cp etc/node-debian.cfg.sample "${D}"/etc/NX/node-gentoo.cfg.sample || die
	sed -e 's|COMMAND_FUSER = .*|COMMAND_FUSER = "/usr/bin/fuser"|;' -i "${D}"/etc/NX/node-gentoo.cfg.sample || die
	cp etc/node.lic.sample "${D}"/etc/NX/node.lic.sample || die

	dodir /usr/NX/lib
	cp -R lib "${D}"/usr/NX || die

	cp -R share "${D}"/usr/NX || die

	dodir /usr/NX/var
	dodir /usr/NX/home
	dodir /var/db/NX
	dosym /var/db/NX /usr/NX/var/db
	dodir /var/lib/NX
	dosym /var/lib/NX /usr/NX/home/nx
	dodir /var/log/NX
	dosym /var/log/NX /usr/NX/var/log
	dodir /var/run/NX
	dosym /var/run/NX /usr/NX/var/run

	dodir /etc/init.d
	newinitd "${FILESDIR}"/nxnode-3.0.0-init nxsensor

pkg_postinst()
{
	# Only install license file if none is found
	if [ ! -f "${ROOT}"/etc/NX/node.lic ]; then
		cp "${ROOT}"/etc/NX/node.lic.sample "${ROOT}"/etc/NX/node.lic || die
		chmod 0400 "${ROOT}"/etc/NX/node.lic
		chown nx:0 "${ROOT}"/etc/NX/node.lic
	fi

	# only run install on the first time
	if [ -f "${ROOT}"/etc/NX/node.cfg ]; then
		einfo "Running NoMachine's update script"
		"${ROOT}"/usr/NX/scripts/setup/nxnode --update
	else

	elog
	elog "  rc-update add nxsensor default"
	elog
	elog "You will also need to change EnableSensor to 1 in /etc/NX/node.cfg"
}

Return to bug 318727

Lines 35-43 Link Here

(-)/usr/portage/net-misc/nxnode/nxnode-3.4.0.14.ebuild (-12 / +47 lines)
35		35
36	S=${WORKDIR}/NX	36	S=${WORKDIR}/NX
37		37
		38	move_dir()
		39	{
		40	if [[ -e $1 && ! -L $1 ]] ; then
		41	mkdir -p $2
		42	mv $1/* $2/
		43	rm -rf $1
		44	fi
		45	}
		46
		47	pkg_setup() {
		48	if [ -d ${ROOT}/usr/NX/etc \
		49	-o -d ${ROOT}/usr/NX/var \
		50	-o -d ${ROOT}/usr/NX/home ]; then
		51	ewarn
		52	ewarn "Collisions are expected here."
		53	ewarn "Use COLLISION_IGNORE=\"/usr/NX/var /usr/NX/home\" emerge ... for this package,"
		54	ewarn "or remove previous versions of nxnode and nxserver-freeedition first."
		55	ewarn
		56	fi
		57	}
		58
38	pkg_preinst()	59	pkg_preinst()
39	{	60	{
40	enewuser nx -1 -1 /usr/NX/home/nx	61	enewuser nx -1 -1 /var/lib/NX
		62	move_dir ${ROOT}/usr/NX/etc ${ROOT}/etc/NX
		63	move_dir ${ROOT}/usr/NX/var/db ${ROOT}/var/db/NX
		64	move_dir ${ROOT}/usr/NX/home/nx ${ROOT}/var/lib/NX
		65	move_dir ${ROOT}/usr/NX/var/log ${ROOT}/var/log/NX
		66	move_dir ${ROOT}/usr/NX/var/run ${ROOT}/var/run/NX
41	}	67	}
42		68
43	src_prepare()	69	src_prepare()
Lines 55-64 Link Here
55	dobin bin/$x	81	dobin bin/$x
56	done	82	done
57		83
58	dodir /usr/NX/etc	84	dodir /etc/NX
59	cp etc/node-debian.cfg.sample "${D}"/usr/NX/etc/node-gentoo.cfg.sample \|\| die	85	dosym /etc/NX /usr/NX/etc
60	sed -e 's\|COMMAND_FUSER = .*\|COMMAND_FUSER = "/usr/bin/fuser"\|;' -i "${D}"/usr/NX/etc/node-gentoo.cfg.sample \|\| die	86	cp etc/node-debian.cfg.sample "${D}"/etc/NX/node-gentoo.cfg.sample \|\| die
61	cp etc/node.lic.sample "${D}"/usr/NX/etc/node.lic.sample \|\| die	87	sed -e 's\|COMMAND_FUSER = .*\|COMMAND_FUSER = "/usr/bin/fuser"\|;' -i "${D}"/etc/NX/node-gentoo.cfg.sample \|\| die
		88	cp etc/node.lic.sample "${D}"/etc/NX/node.lic.sample \|\| die
62		89
63	dodir /usr/NX/lib	90	dodir /usr/NX/lib
64	cp -R lib "${D}"/usr/NX \|\| die	91	cp -R lib "${D}"/usr/NX \|\| die
Lines 70-76 Link Here
70	cp -R share "${D}"/usr/NX \|\| die	97	cp -R share "${D}"/usr/NX \|\| die
71		98
72	dodir /usr/NX/var	99	dodir /usr/NX/var
73	cp -R var "${D}"/usr/NX \|\| die	100	dodir /usr/NX/home
		101	dodir /var/db/NX
		102	dosym /var/db/NX /usr/NX/var/db
		103	dodir /var/lib/NX
		104	dosym /var/lib/NX /usr/NX/home/nx
		105	dodir /var/log/NX
		106	dosym /var/log/NX /usr/NX/var/log
		107	dodir /var/run/NX
		108	dosym /var/run/NX /usr/NX/var/run
74		109
75	dodir /etc/init.d	110	dodir /etc/init.d
76	newinitd "${FILESDIR}"/nxnode-3.0.0-init nxsensor	111	newinitd "${FILESDIR}"/nxnode-3.0.0-init nxsensor
Lines 79-92 Link Here
79	pkg_postinst()	114	pkg_postinst()
80	{	115	{
81	# Only install license file if none is found	116	# Only install license file if none is found
82	if [ ! -f /usr/NX/etc/node.lic ]; then	117	if [ ! -f "${ROOT}"/etc/NX/node.lic ]; then
83	cp "${ROOT}"/usr/NX/etc/node.lic.sample "${ROOT}"/usr/NX/etc/node.lic \|\| die	118	cp "${ROOT}"/etc/NX/node.lic.sample "${ROOT}"/etc/NX/node.lic \|\| die
84	chmod 0400 "${ROOT}"/usr/NX/etc/node.lic	119	chmod 0400 "${ROOT}"/etc/NX/node.lic
85	chown nx:0 "${ROOT}"/usr/NX/etc/node.lic	120	chown nx:0 "${ROOT}"/etc/NX/node.lic
86	fi	121	fi
87		122
88	# only run install on the first time	123	# only run install on the first time
89	if [ -f /usr/NX/etc/node.cfg ]; then	124	if [ -f "${ROOT}"/etc/NX/node.cfg ]; then
90	einfo "Running NoMachine's update script"	125	einfo "Running NoMachine's update script"
91	"${ROOT}"/usr/NX/scripts/setup/nxnode --update	126	"${ROOT}"/usr/NX/scripts/setup/nxnode --update
92	else	127	else
Lines 98-102 Link Here
98	elog	133	elog
99	elog " rc-update add nxsensor default"	134	elog " rc-update add nxsensor default"
100	elog	135	elog
101	elog "You will also need to change EnableSensor to 1 in /usr/NX/etc/node.cfg"	136	elog "You will also need to change EnableSensor to 1 in /etc/NX/node.cfg"
102	}	137	}