[PC-BSD Commits] r18848 - pcbsd/current/src-sh/pc-metapkgmanager

[svn at pcbsd.org]

Author: kris
Date: 2012-09-04 20:37:59 +0000 (Tue, 04 Sep 2012)
New Revision: 18848

Modified:
   pcbsd/current/src-sh/pc-metapkgmanager/pc-metapkgmanager
Log:

Update pc-metapkgmanager, fix some issues with it not resolving all deps



Modified: pcbsd/current/src-sh/pc-metapkgmanager/pc-metapkgmanager
===================================================================
--- pcbsd/current/src-sh/pc-metapkgmanager/pc-metapkgmanager	2012-09-04 20:03:36 UTC (rev 18847)
+++ pcbsd/current/src-sh/pc-metapkgmanager/pc-metapkgmanager	2012-09-04 20:37:59 UTC (rev 18848)
@@ -154,7 +154,17 @@
 	      fi
 	      echo "Installing package: $pkg"
 	      echo "Installing package: $pkg" >>${LOGFILE}
-	      ${_chrootcmd} pkg_add -f "${TMPDIR}/${pkg}.txz" >>${LOGFILE} 2>>${LOGFILE}
+	      if [ -z "${_chroot}" ] ; then
+		cd ${TMPDIR}
+	        pkg_add -f "${pkg}.txz" >>${LOGFILE} 2>>${LOGFILE}
+              else
+	        echo "#!/bin/sh
+cd ${TMPDIR}
+pkg_add -f ${pkg}.txz" > ${_chroot}/.insPkg.$$.sh
+	        chmod 755 ${_chroot}/.insPkg.$$.sh
+	        ${_chrootcmd} ${_chroot} /.insPkg.$$.sh >>${LOGFILE} 2>>${LOGFILE}
+	        rm "${_chroot}/.insPkg.$$.sh"
+	      fi
 	      rm "${_chroot}/${TMPDIR}/${pkg}.txz"
            done
 	fi