Radish alpha
H
HardenedBSD Package Manager
Radicle
Git (anonymous pull)
Log in to clone via SSH
Better handle optionnal arguments
Baptiste Daroussin committed 15 years ago
commit 353bab3c169e7856c5f8ee17c98cea3643243405
parent 8d609e2648e1da4b958b0287550d0e7d9a5f5b98
1 file changed +13 -6
modified ports/pkg2ng
@@ -53,13 +53,20 @@ do

	MAINTAINER=`make -C /usr/ports/${ORIGIN} -V MAINTAINER`

-
	CMD="pkg register -c ${COMMENT} -d ${DESC} -p /usr/local -m ${MTREE} \
-
		-P "`cat ${DEPENDSF}`" -n ${PKG} -o ${ORIGIN} -C ${CONFLICTS} \
-
		-f ${PLIST} -M ${MESSAGE} -s ${SCRIPTS} \
-
		-a ${ARCH} -r ${MAINTAINER} -O ${OPTIONS}"
+
	test -n "${SCRIPTS}" && CMD_ARGS="${CMD_ARGS} -s ${SCRIPTS}"
+
	test -n "${OPTIONS}" && CMD_ARGS="${CMD_ARGS} -O ${OPTIONS}"
+
	test -f "${MESSAGE}" && CMD_ARGS="${CMD_ARGS} -M ${MESSAGE}"
+
	test -n "${CONFLICTS}" && CMD_ARGS="${CMD_ARGS} -C ${CONFLICTS}"

-
	echo ${CMD}
-
	${CMD}
+
	if [ -s "${DEPENDSF}" ]; then
+
		pkg register -c ${COMMENT} -d ${DESC} -p /usr/local -m ${MTREE} \
+
		-n ${PKG} -o ${ORIGIN} -a ${ARCH} \
+
		-r ${MAINTAINER} -f ${PLIST} ${CMD_ARGS} -P "`cat ${DEPENDSF}`"
+
	else
+
		pkg register -c ${COMMENT} -d ${DESC} -p /usr/local -m ${MTREE} \
+
		-n ${PKG} -o ${ORIGIN} -a ${ARCH} \
+
		-r ${MAINTAINER} -f ${PLIST} ${CMD_ARGS}
+
	fi

	rm ${DEPENDSF} ${PLIST}
	echo " done"