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

[svn at pcbsd.org]

Author: kris
Date: 2011-09-29 07:50:40 -0700 (Thu, 29 Sep 2011)
New Revision: 13043

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

Fix some bugs when copying linux libs into PBI, and add some extra verbosity during creation



Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2011-09-29 14:39:34 UTC (rev 13042)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2011-09-29 14:50:40 UTC (rev 13043)
@@ -3215,6 +3215,7 @@
 # Start looping through and creating a hash-list of files
 mk_hash_list() {
   	if [ "${PBI_CREATE_HASHLIST}" = "NO" ] ; then return 0 ; fi
+	echo "Creating hash list..."
 
 	hashfile="${PBI_STAGEDIR}/${PBI_HASHLIST}"
 
@@ -3275,6 +3276,7 @@
 
 # Parse any external link directives
 mk_extlink_entries() {
+	echo "Creating external link entries..."
 	init_tmpdir
 	_extf="${PBI_CONFDIR}/${MOD_EXTLINKFILE}"
 	_autoextf="${PBI_STAGEDIR}/${MOD_AUTOEXTLINKFILE}"
@@ -3452,6 +3454,7 @@
 
 # Create any XDG script for install / deinstall
 mk_xdg_scripts() {
+ 	echo "Creating xdg scripts..."
   	mk_xdg_desktop_script
   	mk_xdg_menu_script
   	mk_xdg_mime_script
@@ -3600,6 +3603,7 @@
 
 # Create the install script for the PBI
 mk_install_script() {
+	echo "Creating install script..."
 	if [ ! -d "${PBI_STAGEDIR}/${PBI_FAKEBIN_DIR}" ] ; then mkdir -p "${PBI_STAGEDIR}/${PBI_FAKEBIN_DIR}" ; fi
 	insc="${PBI_STAGEDIR}/${PBI_FAKEBIN_DIR}/.pbi-install.sh"
 	echo "#!/bin/sh" > "$insc"
@@ -3651,6 +3655,7 @@
 
 # Create the deinstall script for the PBI
 mk_deinstall_script() {
+	echo "Creating deinstall script..."
 	uisc="${PBI_STAGEDIR}/${PBI_FAKEBIN_DIR}/.pbi-uninstall.sh"
 
 	echo "#!/bin/sh" > "$uisc"
@@ -5921,11 +5926,17 @@
 # Check if we created any linux stuff, and copy it into the correct PREFIX
 auto_copy_linuxbase()
 {
+	echo "Checking for Linux libraries to copy..."
 	if [ -d "/compat/linux/lib" ] ; then
-		echo "Copying linux compat libraries..."
+		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
+		tar xvf - -C ${PBI_PROGDIRPATH}/lib 2>/dev/null
 	fi
+	if [ -d "/compat/linux/usr/lib" ] ; then
+		echo "Copying /compat/linux/usr/lib -> ${PBI_PROGDIRPATH}/lib"
+		tar cvf - -C /compat/linux/usr/lib . 2>/dev/null | \
+		tar xvf - -C ${PBI_PROGDIRPATH}/lib 2>/dev/null
+	fi
 }
 
 # Clean the chroot environment