[Lunar-commits] <lunar> Use xz for lin module cache files

[Peter de Ridder]

commit ac3d7ec3acee88d2be0284153399bd680717478b
Author: Peter de Ridder <peter at lunar-linux.org>
Date: Sat, 05 Jan 2013 15:27:54 -0800
URL: https://github.com/lunar-linux/lunar/commit/ac3d7ec3acee88d2be0284153399bd680717478b

Use xz for lin module cache files
---
  libs/main.lunar               | +14/-6    
  libs/prune.lunar              | +1/-0     
  libs/tracking.lunar           | +2/-2     
  libs/view.lunar               | +1/-0     
  plugins/build-zpatches.plugin | +2/-0     
  prog/lrm                      | +15/-4    
  6 files changed, 35 insertions(+), 12 deletions(-)

--- a/libs/main.lunar
+++ b/libs/main.lunar
@@ -132,10 +132,10 @@ expand_cache_safe() {(
   export SOURCE_DIRECTORY=$BUILD_DIRECTORY/resurrect-$MODULE-$VERSION
   mk_source_dir $SOURCE_DIRECTORY
   # untar the file so we can compare first
-  tar -pkxjf $1 -C $SOURCE_DIRECTORY 1>/dev/null 2>&1
+  tar -pkxf $1 -C $SOURCE_DIRECTORY 1>/dev/null 2>&1
   # make a md5sum list of files
   TMP_TARGETS=$(temp_create "resurrect.targets.$MODULE")
-  tar j --list < $1 > $TMP_TARGETS
+  tar tf $1 > $TMP_TARGETS
   TMP_TARGETS_OK=$(temp_create "resurrect.targets_OK.$MODULE")
   # do directories: we don't care here
   # the sed trick is advanced: a non-greedy pattern that returns all
@@ -167,7 +167,7 @@ expand_cache_safe() {(
   done
 
   debug_msg "tar xjf $1 -P -k -T $TMP_TARGETS_OK"
-  tar xjf $1 -P -k -T $TMP_TARGETS_OK > /dev/null 2>&1
+  tar xf $1 -P -k -T $TMP_TARGETS_OK > /dev/null 2>&1
 
   temp_destroy $TMP_TARGETS
   temp_destroy $TMP_TARGETS_OK
@@ -198,11 +198,19 @@ resurrect()  {
     lrm --keepconfig $MODULE
   fi &&
 
-  CACHE_BZ="$INSTALL_CACHE/$MODULE-$VERSION-$BUILD.tar.bz2"
+  CACHE_XZ="$INSTALL_CACHE/$MODULE-$VERSION-$BUILD.tar.xz"
+  XZBZ=xz
+  if [ ! -f "$CACHE_XZ" ] ; then
+    CACHE_BZ="$INSTALL_CACHE/$MODULE-$VERSION-$BUILD.tar.bz2"
+    if [ -f "$CACHE_BZ" ] ; then
+      CACHE_XZ="$CACHE_BZ"
+      XZBZ=bzip2
+    fi
+  fi
 
-  if [ -f "$CACHE_BZ" ] && bzip2 -tf $CACHE_BZ ; then
+  if [ -f "$CACHE_XZ" ] && $XZBZ -tf $CACHE_XZ ; then
     message  "${RESURRECT_COLOR}Resurrecting ${MODULE_COLOR}${MODULE}${DEFAULT_COLOR} ${MESSAGE_COLOR}version ${VERSION_COLOR}${VERSION}${DEFAULT_COLOR}"
-    expand_cache_safe $CACHE_BZ &&
+    expand_cache_safe $CACHE_XZ &&
     add_module $MODULE $STATUS $VERSION &&
     verbose_msg "running \"lunar fix $MODULE\"" &&
     if run_fix $MODULE ; then
--- a/libs/prune.lunar
+++ b/libs/prune.lunar
@@ -33,6 +33,7 @@ prune() {
     # cache:
       VERSION=$(installed_version $MODULE)
     
+      echo "$MODULE-$VERSION-$BUILD.tar.xz" >> $TMP_CACHE_KEEP
       echo "$MODULE-$VERSION-$BUILD.tar.bz2" >> $TMP_CACHE_KEEP
     fi
   done
--- a/libs/tracking.lunar
+++ b/libs/tracking.lunar
@@ -108,8 +108,8 @@ create_install_cache() {
     return
   fi
 
-  message "${MESSAGE_COLOR}Creating ${FILE_COLOR}$INSTALL_CACHE/$MODULE-$VERSION-$BUILD.tar.bz2${DEFAULT_COLOR}"
-  tar cPjf "$INSTALL_CACHE/$MODULE-$VERSION-$BUILD.tar.bz2" --no-recursion -T $INSTALL_LOGS/$MODULE-$VERSION
+  message "${MESSAGE_COLOR}Creating ${FILE_COLOR}$INSTALL_CACHE/$MODULE-$VERSION-$BUILD.tar.xz${DEFAULT_COLOR}"
+  tar cPJf "$INSTALL_CACHE/$MODULE-$VERSION-$BUILD.tar.xz" --no-recursion -T $INSTALL_LOGS/$MODULE-$VERSION
 
 }
 
--- a/libs/view.lunar
+++ b/libs/view.lunar
@@ -15,6 +15,7 @@ view_file()  {
     case $(file -b $1 | cut -d' ' -f1) in
       bzip2) bzcat $1 | ${PAGER:-less} ;;
        gzip) zcat $1  | ${PAGER:-less} ;;
+         xz) xzcat $1 | ${PAGER:-less} ;;
           *)
              # default fallback
              cat "$1" | ${PAGER:-less} ;;
--- a/plugins/build-zpatches.plugin
+++ b/plugins/build-zpatches.plugin
@@ -39,6 +39,8 @@ plugin_zpatches_apply()
         GZCMD="bzcat"
       elif [[ -n `echo $PATCH | grep '\.gz$'` ]] ; then
         GZCMD="zcat"
+      elif [[ -n `echo $PATCH | grep '\.xz$'` ]] ; then
+        GZCMD="xzcat"
       else
         GZCMD="cat"
       fi
--- a/prog/lrm
+++ b/prog/lrm
@@ -240,6 +240,8 @@ check_status() {
 
 
 downgrade() {
+  local CACHE_XZ XZBZ
+
   # a local function for listing the contents of install cache
   list_available_cache() {
     ls -1 $INSTALL_CACHE/$MODULE-* | while read LINE ; do
@@ -259,7 +261,17 @@ downgrade() {
     list_available_cache   
   fi
 
-  if [ ! -s $INSTALL_CACHE/$MODULE-$1-$BUILD.tar.bz2 ] ; then 
+  CACHE_XZ="$INSTALL_CACHE/$MODULE-$1-$BUILD.tar.xz"
+  XZBZ=xzcat
+  if [ ! -f $CACHE_XZ ] ; then
+    CACHE_BZ="$INSTALL_CACHE/$MODULE-$1-$BUILD.tar.bz"
+    if [ -f $CACHE_BZ ] ; then
+      CACHE_XZ="$CACHE_BZ"
+      XZBZ=bzcat
+    fi
+  fi
+
+  if [ ! -s $CACHE_XZ ] ; then 
     message "Desired version is not available. Here is the available files"
     list_available_cache
   fi
@@ -285,11 +297,10 @@ downgrade() {
   verbose_msg "installing \"$MODULE-$1\""
   verbose_msg "extracting cached install file..."
   
-  bzcat $INSTALL_CACHE/$MODULE-$1-$BUILD.tar.bz2 | tar -kt $TAR_P -C / >/dev/null
+  $XZBZ $CACHE_XZ | tar -kt $TAR_P -C / >/dev/null
   verbose_msg "adding module to installed list"
 
-  bzcat $INSTALL_CACHE/$MODULE-$1-$BUILD.tar.bz2 | 
-  tar -kx $TAR_P -C / 2>/dev/null >/dev/null
+  $XZBZ $CACHE_XZ | tar -kx $TAR_P -C / 2>/dev/null >/dev/null
   verbose_msg "adding module to installed list"
   add_module $MODULE installed  $1
   activity_log  "lrm downgrade"  "$MODULE"  "$1"  "success"