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

[svn at pcbsd.org]

Author: kris
Date: 2012-10-15 14:24:06 +0000 (Mon, 15 Oct 2012)
New Revision: 19668

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

Make sure the wrapper call is set after manually specifying -32



Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2012-10-15 14:19:52 UTC (rev 19667)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2012-10-15 14:24:06 UTC (rev 19668)
@@ -1215,7 +1215,6 @@
         if [ -z "${PBI_MAKEPORT}" ]; then
                 usage_make_pbi
         fi
-
 }
 
 # Parse the update command line
@@ -1317,7 +1316,6 @@
   	FBSDREL=`uname -r`
 	FBSDMAJOR=${FBSDREL%%.*}
 
-	PBI_WRAPPERFILE="${PBI_APPDIR}/.pbiwrapper-$ARCH"
 	PBI_CHROOTFILE="${PBI_APPDIR}/.pbi-world-$ARCH.txz"
 	if [ `id -u` = "0" ] ; then 
 		PBI_HASHDIR="${PBI_APPDIR}/.hashdir"
@@ -3715,6 +3713,7 @@
 	fi
 
 	# Copy the wrapper binary
+	PBI_WRAPPERFILE="${PBI_APPDIR}/.pbiwrapper-$ARCH"
 	cp ${PBI_WRAPPERFILE} ${dir}/${fbin}
 	chmod 755 ${dir}/${fbin}
 
@@ -6734,6 +6733,7 @@
 	cp /etc/resolv.conf ${PBI_CHROOTDIR}/etc/resolv.conf
 
 	# Copy our binary wrapper
+	PBI_WRAPPERFILE="${PBI_APPDIR}/.pbiwrapper-$ARCH"
 	mkdir ${PBI_CHROOTDIR}${PBI_APPDIR} 2>/dev/null
 	cp ${PBI_WRAPPERFILE} ${PBI_CHROOTDIR}${PBI_WRAPPERFILE}