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

[svn at pcbsd.org]

Author: kris
Date: 2012-04-14 01:13:40 +0000 (Sat, 14 Apr 2012)
New Revision: 16406

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

Revert pkg extensions to .tbz



Modified: pcbsd/current/src-sh/pc-metapkgmanager/pc-metapkgmanager
===================================================================
--- pcbsd/current/src-sh/pc-metapkgmanager/pc-metapkgmanager	2012-04-13 20:26:14 UTC (rev 16405)
+++ pcbsd/current/src-sh/pc-metapkgmanager/pc-metapkgmanager	2012-04-14 01:13:40 UTC (rev 16406)
@@ -91,16 +91,16 @@
 		# Start installing the packages now
 		if [ "$loc" = "NET" ] ; then
 			PACKAGESITE="$2" ; export PACKAGESITE
-			${_chrootcmd} pkg_add -f -r "${pkg}.txz" >>${LOGFILE} 2>>${LOGFILE}
+			${_chrootcmd} pkg_add -f -r "${pkg}.tbz" >>${LOGFILE} 2>>${LOGFILE}
 		else
 		  if [ -z "$_chroot" ] ; then
 		     cd "${2}"
-		     pkg_add -f "${pkg}.txz" >>${LOGFILE} 2>>${LOGFILE}
+		     pkg_add -f "${pkg}.tbz" >>${LOGFILE} 2>>${LOGFILE}
 		  else
 		     # Do some nullfs mounting to get our dist dir into the chroot
 		     mkdir ${_chroot}/.mnt.$$
 		     mount_nullfs "$2" "${_chroot}/.mnt.$$"
-		     ${_chrootcmd} pkg_add -f "/.mnt.$$/${pkg}.txz" >>${LOGFILE} 2>>${LOGFILE}
+		     ${_chrootcmd} pkg_add -f "/.mnt.$$/${pkg}.tbz" >>${LOGFILE} 2>>${LOGFILE}
 		  fi
 		fi
         done < ${MPDIR}/${_apkg}/pkg-list
@@ -555,12 +555,12 @@
   # Start installing the packages now
   if [ "$loc" = "NET" ] ; then
      #echo "${_chrootcmd} pkg_add -f -r $nPkg"
-     ${_chrootcmd} pkg_add -f -r "${nPkg}.txz" >>${LOGFILE} 2>>${LOGFILE}
+     ${_chrootcmd} pkg_add -f -r "${nPkg}.tbz" >>${LOGFILE} 2>>${LOGFILE}
   else
      if [ -z "$_chroot" ] ; then
-        pkg_add -f "${nPkg}.txz" >>${LOGFILE} 2>>${LOGFILE}
+        pkg_add -f "${nPkg}.tbz" >>${LOGFILE} 2>>${LOGFILE}
      else
-        ${_chrootcmd} pkg_add -f "/.mnt.$$/${nPkg}.txz" >>${LOGFILE} 2>>${LOGFILE}
+        ${_chrootcmd} pkg_add -f "/.mnt.$$/${nPkg}.tbz" >>${LOGFILE} 2>>${LOGFILE}
      fi
   fi