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

[svn at pcbsd.org]

Author: kris
Date: 2011-10-05 07:07:13 -0700 (Wed, 05 Oct 2011)
New Revision: 13141

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

Make sure we get all linux libs / files in a PBI



Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2011-10-05 13:19:56 UTC (rev 13140)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2011-10-05 14:07:13 UTC (rev 13141)
@@ -5941,9 +5941,10 @@
 {
 	echo "Checking for Linux libraries to copy..."
 	if [ -d "/compat/linux/lib" ] ; then
-		echo "Copying /compat/linux/lib -> ${PBI_PROGDIRPATH}/lib"
-		tar cvf - -C /compat/linux/lib . 2>/dev/null | \
-		tar xvf - -C ${PBI_PROGDIRPATH}/lib 2>/dev/null
+		echo "Copying /compat/linux -> ${PBI_PROGDIRPATH}"
+		tar cvf - -C /compat/linux . 2>/dev/null | \
+		tar xvf - -C ${PBI_PROGDIRPATH} 2>/dev/null
+		rm -rf ${PBI_PROGDIRPATH}/usr/lib >/dev/null 2>/dev/null
 	fi
 	if [ -d "/compat/linux/usr/lib" ] ; then
 		echo "Copying /compat/linux/usr/lib -> ${PBI_PROGDIRPATH}/lib"