[PC-BSD Commits] r15793 - pcbsd/current/src-qt4/warden/scripts/backend

[svn at pcbsd.org]

Author: kris
Date: 2012-03-12 21:14:41 +0000 (Mon, 12 Mar 2012)
New Revision: 15793

Modified:
   pcbsd/current/src-qt4/warden/scripts/backend/exportjail.sh
   pcbsd/current/src-qt4/warden/scripts/backend/importjail.sh
   pcbsd/current/src-qt4/warden/scripts/backend/installinmate.sh
   pcbsd/current/src-qt4/warden/scripts/backend/mkinmate.sh
Log:

Remove lzma support, use -J in tar now



Modified: pcbsd/current/src-qt4/warden/scripts/backend/exportjail.sh
===================================================================
--- pcbsd/current/src-qt4/warden/scripts/backend/exportjail.sh	2012-03-12 21:12:28 UTC (rev 15792)
+++ pcbsd/current/src-qt4/warden/scripts/backend/exportjail.sh	2012-03-12 21:14:41 UTC (rev 15793)
@@ -45,9 +45,8 @@
 
 
 echo "Creating compressed archive of ${IP}... Please Wait..." >&1
-tar cvf - . 2>${WTMP}/${IP}.files | lzma -z - >"${WTMP}/${IP}.lzma" #2>/dev/null
+tar cvJf "${WTMP}/${IP}.tlz" . 2>${WTMP}/${IP}.files
 
-
 cd ${WTMP}
 
 LINES="`wc -l ${IP}.files | sed -e 's, ,,g' | cut -d '.' -f 1`"
@@ -71,12 +70,12 @@
 ___WARDEN_START___" > .spacer
 
 # Make the .wdn file now
-cat ${IP}.header.tgz .spacer ${IP}.lzma > ${IP}.wdn
+cat ${IP}.header.tgz .spacer ${IP}.tlz > ${IP}.wdn
 
 # Remove the old files
 rm ${IP}.header
 rm ${IP}.files
-rm ${IP}.lzma
+rm ${IP}.tlz
 rm .spacer
 rm ${IP}.header.tgz
 

Modified: pcbsd/current/src-qt4/warden/scripts/backend/importjail.sh
===================================================================
--- pcbsd/current/src-qt4/warden/scripts/backend/importjail.sh	2012-03-12 21:12:28 UTC (rev 15792)
+++ pcbsd/current/src-qt4/warden/scripts/backend/importjail.sh	2012-03-12 21:14:41 UTC (rev 15793)
@@ -147,7 +147,7 @@
 mkdir -p "${JDIR}/${IP}"
 
 # Extract the jail contents
-tail +${SKIP} ${IFILE} | lzma -d -c 2>/dev/null | tar xpf - -C "${JDIR}/${IP}" 2>/dev/null
+tail +${SKIP} ${IFILE} | tar xpf - -C "${JDIR}/${IP}" 2>/dev/null
 
 # Make sure we have an IP address saved
 echo "${IP}" >"${JDIR}/${IP}/etc/warden/ip"

Modified: pcbsd/current/src-qt4/warden/scripts/backend/installinmate.sh
===================================================================
--- pcbsd/current/src-qt4/warden/scripts/backend/installinmate.sh	2012-03-12 21:12:28 UTC (rev 15792)
+++ pcbsd/current/src-qt4/warden/scripts/backend/installinmate.sh	2012-03-12 21:14:41 UTC (rev 15793)
@@ -102,7 +102,7 @@
 mkdir -p "${JDIR}/${IP}/.tmp.$$"
 
 # Extract the inmate contents
-tail +${SKIP} ${IFILE} | lzma -d -c 2>/dev/null | tar xpf - -C "${JDIR}/${IP}/.tmp.$$" 2>/dev/null
+tail +${SKIP} ${IFILE} | tar xpf - -C "${JDIR}/${IP}/.tmp.$$" 2>/dev/null
 
 # Export our varibles for the scripts  
 IDIR="/.tmp.$$" ; export IDIR

Modified: pcbsd/current/src-qt4/warden/scripts/backend/mkinmate.sh
===================================================================
--- pcbsd/current/src-qt4/warden/scripts/backend/mkinmate.sh	2012-03-12 21:12:28 UTC (rev 15792)
+++ pcbsd/current/src-qt4/warden/scripts/backend/mkinmate.sh	2012-03-12 21:14:41 UTC (rev 15793)
@@ -109,11 +109,11 @@
 echo "
 ___INMATE_START___" > .spacer
 
-# Create the lzma of the package
-tar cvf - -C ${IDIR} . 2>/dev/null | lzma -z - >"pkg.lzma" 2>/dev/null
+# Create the tlz of the package
+tar cvJf "pkg.tlz" -C ${IDIR} . 2>/dev/null
 
 # Make the .wit file now
-cat header.tgz .spacer pkg.lzma > ../${FNAME}${FVER}.wit
+cat header.tgz .spacer pkg.tlz > ../${FNAME}${FVER}.wit
 
 cd ..
 rm -rf .wdntmp