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

[svn at pcbsd.org]

Author: kris
Date: 2012-11-12 19:26:16 +0000 (Mon, 12 Nov 2012)
New Revision: 20195

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

Use PBI_PROGNAME instead of PBI_CNAME in case user didn't give -c on CLI



Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2012-11-12 19:22:58 UTC (rev 20194)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2012-11-12 19:26:16 UTC (rev 20195)
@@ -3415,10 +3415,14 @@
 		exit_trap
 	fi
 
+	load_pbi_conffile
+
+	parse_cmdline_overrides
+
 	# Copy over the application to the correct location
         echo ${PBI_PROGDIRPATH} | grep -q "^${PBI_APPDIR}/"
 	if [ $? -ne 0 ] ; then
-	   newPDP="${PBI_APPDIR}/${PBI_CNAME}-${ARCH}"
+	   newPDP="${PBI_APPDIR}/${PBI_PROGNAME}-${ARCH}"
 	   if [ -d "${newPDP}" ] ; then exit_err "Error: ${newPDP} already exists!" ; fi	
 	   cp -r ${PBI_PROGDIRPATH} ${newPDP}
 	   PBI_PROGDIRPATH="${newPDP}"
@@ -3427,10 +3431,6 @@
 
 	PBI_CREATEONLY="YES"
 
-	load_pbi_conffile
-
-	parse_cmdline_overrides
-
 	check_create_required_vars
 
 	do_pbi_create