[PC-BSD Commits] r17357 - pcbsd/current/src-sh/pbi-manager

[svn at pcbsd.org]

Author: kris
Date: 2012-06-20 21:03:35 +0000 (Wed, 20 Jun 2012)
New Revision: 17357

Modified:
   pcbsd/current/src-sh/pbi-manager/pbi-manager
Log:

Fix a bug setting the PBI name, when pulling from a port that uses PKGNAMESUFFIX
or PKGNAMEPREFIX in the naming scheme. 



Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2012-06-20 20:22:22 UTC (rev 17356)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2012-06-20 21:03:35 UTC (rev 17357)
@@ -1524,14 +1524,18 @@
 
 # Get the PBI_PROGNAME
 get_pbi_progname() {
-	if [ -z "${PBI_PROGNAME}" ] ; then
+	if [ -z "${PBI_PROGNAME}" -o "${PBI_PROGNAME}" = " " ] ; then
 		load_pbi_conffile
 	else
 		return 0
 	fi
 
 	if [ -z "${PBI_PROGNAME}" -a -n "${PORTSDIR}" -a -n "${PBI_MAKEPORT}" ] ; then
-		PBI_PROGNAME="`make -C ${PORTSDIR}/${PBI_MAKEPORT} -V PORTNAME`"
+		# Get the proper package name from the prefix + name + suffix
+		local pkgPrefix="`make -C ${PORTSDIR}/${PBI_MAKEPORT} -V PKGNAMEPREFIX`"
+		local pkgName="`make -C ${PORTSDIR}/${PBI_MAKEPORT} -V PORTNAME`"
+		local pkgSuffix="`make -C ${PORTSDIR}/${PBI_MAKEPORT} -V PKGNAMESUFFIX`"
+		PBI_PROGNAME="${pkgPrefix}${pkgName}${pkgSuffix}"
 	else
 		exit_err "Failed to locate PBI_PROGNAME"
 	fi
@@ -3399,6 +3403,7 @@
 
 # Start the pbi_create process
 do_pbi_create() {
+	get_pbi_progname
 	echo "Creating PBI: ${PBI_PROGNAME}-${PBI_PROGVERSION}"
 
 	mk_header_dir