[Lunar-commits] <lunar> Place default COMPRESS_METHOD in /etc/lunar/config.

[Peter de Ridder]

commit b625b0b46d22b1cc7091dd18dfb11ca97ef3f779
Author: Peter de Ridder <peter at lunar-linux.org>
Date: Mon, 10 Jun 2013 11:38:00 -0700
URL: https://github.com/lunar-linux/lunar/commit/b625b0b46d22b1cc7091dd18dfb11ca97ef3f779

Place default COMPRESS_METHOD in /etc/lunar/config.
---
  etc/config          | +1/-0     
  libs/logging.lunar  | +1/-1     
  libs/main.lunar     | +3/-3     
  libs/tracking.lunar | +2/-2     
  4 files changed, 7 insertions(+), 6 deletions(-)

--- a/etc/config
+++ b/etc/config
@@ -35,6 +35,7 @@ export        DIALOGRC=/etc/lunar/dialogrc
            MD5SUM_LOGS=/var/log/lunar/md5sum
          INSTALL_QUEUE=/var/log/lunar/queue/install
           REMOVE_QUEUE=/var/log/lunar/queue/remove
+       COMPRESS_METHOD=xz
 
         DEPENDS_STATUS=/var/state/lunar/depends
  DEPENDS_STATUS_BACKUP=/var/state/lunar/depends.backup
--- a/libs/logging.lunar
+++ b/libs/logging.lunar
@@ -29,7 +29,7 @@ stop_logging() {
   echo > $C_FIFO
   echo "++ Mark Compile stop   : \"$MODULE\" \"$VERSION\" \"$(date -Ru)\"" >> $C_LOG
   message  "${MESSAGE_COLOR}Creating"                        \
-           "${FILE_COLOR}$COMPILE_LOGS/$MODULE-$VERSION.${COMPRESS_METHOD:=xz}"  \
+           "${FILE_COLOR}$COMPILE_LOGS/$MODULE-$VERSION.${COMPRESS_METHOD}"  \
            "${DEFAULT_COLOR}"
 
   ${COMPRESS_METHOD/bz2/bzip2} -9f < $C_LOG > $COMPILE_LOGS/$MODULE-$VERSION.${COMPRESS_METHOD}
--- a/libs/main.lunar
+++ b/libs/main.lunar
@@ -319,7 +319,7 @@ lin_module()  {
       sound FAILURE
       message "${PROBLEM_COLOR}! Problem detected during ${FILE_COLOR}$LIN_ERROR${DEFAULT_COLOR}"
       rm -f $linING
-      report $COMPILE_LOGS/$MODULE-$VERSION.${COMPRESS_METHOD:-xz} "compile log" $MODULE $VERSION
+      report $COMPILE_LOGS/$MODULE-$VERSION.${COMPRESS_METHOD} "compile log" $MODULE $VERSION
       activity_log  "lin"  "$MODULE"  "$VERSION"  "failed" "Due to build errors during $LIN_ERROR"
       return 1
     fi
@@ -340,7 +340,7 @@ lin_module()  {
       sound FAILURE
       message "${PROBLEM_COLOR}! Problem detected during ${FILE_COLOR}$LIN_ERROR${DEFAULT_COLOR}"
       rm -f $linING
-      report $COMPILE_LOGS/$MODULE-$VERSION.${COMPRESS_METHOD:-xz} "compile log" $MODULE $VERSION
+      report $COMPILE_LOGS/$MODULE-$VERSION.${COMPRESS_METHOD} "compile log" $MODULE $VERSION
       activity_log  "lin"  "$MODULE"  "$VERSION"  "failed" "Due to build errors during $LIN_ERROR"
       return 1
     fi
@@ -355,7 +355,7 @@ lin_module()  {
       sound FAILURE
       message "${PROBLEM_COLOR}! Problem detected${DEFAULT_COLOR}"
       rm -f $linING
-      report $COMPILE_LOGS/$MODULE-$VERSION.${COMPRESS_METHOD:-xz} "compile log" $MODULE $VERSION
+      report $COMPILE_LOGS/$MODULE-$VERSION.${COMPRESS_METHOD} "compile log" $MODULE $VERSION
       activity_log  "lin"  "$MODULE"  "$VERSION"  "failed" "Due to build errors during or after $LIN_ERROR"
       return 1
     fi
--- a/libs/tracking.lunar
+++ b/libs/tracking.lunar
@@ -75,7 +75,7 @@ create_install_log() {
 
   parse_iw | sort | uniq | filter "$LOCAL_EXCLUDED" | custom_filters | exists > $TMP_INST_LOG
   echo "$INSTALL_LOGS/$MODULE-$VERSION"                 >> $TMP_INST_LOG
-  echo "$COMPILE_LOGS/$MODULE-$VERSION.${COMPRESS_METHOD:-xz}" >> $TMP_INST_LOG
+  echo "$COMPILE_LOGS/$MODULE-$VERSION.${COMPRESS_METHOD}" >> $TMP_INST_LOG
   echo "$MD5SUM_LOGS/$MODULE-$VERSION"                  >> $TMP_INST_LOG
 
   install -m644 $TMP_INST_LOG $INST_LOG
@@ -101,7 +101,7 @@ create_install_cache() {
     return
   fi
 
-  message "${MESSAGE_COLOR}Creating ${FILE_COLOR}$INSTALL_CACHE/$MODULE-$VERSION-$BUILD.tar.${COMPRESS_METHOD:=xz}${DEFAULT_COLOR}"
+  message "${MESSAGE_COLOR}Creating ${FILE_COLOR}$INSTALL_CACHE/$MODULE-$VERSION-$BUILD.tar.${COMPRESS_METHOD}${DEFAULT_COLOR}"
   tar cP --no-recursion -T $INSTALL_LOGS/$MODULE-$VERSION | ${COMPRESS_METHOD/bz2/bzip2} > "$INSTALL_CACHE/$MODULE-$VERSION-$BUILD.tar.${COMPRESS_METHOD}"
 
 }