Change pxz to pixz

.config.example

@@ -13,4 +13,4 @@ PKG_PATH=pkg
 # Compression to use for packages
 # format:
 #   extension:binary:parallel_binary:arguments
-COMPRESSION=xz:xz:pxz:-1
+COMPRESSION=xz:xz:pixz:-1

README.md

@@ -13,10 +13,10 @@ Requirements:
 - sudo
 - wget
 - tar
-- xz/gz
+- xz/gzip
 
 Optional:
-- pxz/pigz (faster compression/decompression)
+- pixz/pigz (faster compression/decompression)
 
 ### Installing
 

server_deploy.sh

@@ -2,7 +2,7 @@
 
 . "$(pwd)/.config"
 
-[ -z "$COMPRESSION" ] && COMPRESSION="xz:xz:pxz"
+[ -z "$COMPRESSION" ] && COMPRESSION="xz:xz:pixz"
 extension=$(echo "$COMPRESSION" | cut -d':' -f1)
 compress=$(echo "$COMPRESSION" | cut -d':' -f2)
 pcompress=$(echo "$COMPRESSION" | cut -d':' -f3)

server_scripts/database_update.sh

@@ -3,7 +3,7 @@
 . "$(pwd)/.config"
 
 # resolve compression
-[ -z "$COMPRESSION" ] && COMPRESSION="xz:xz:pxz"
+[ -z "$COMPRESSION" ] && COMPRESSION="xz:xz:pixz"
 extension=$(echo "$COMPRESSION" | cut -d':' -f1)
 compress=$(echo "$COMPRESSION" | cut -d':' -f2)
 pcompress=$(echo "$COMPRESSION" | cut -d':' -f3)
@@ -11,10 +11,11 @@ which $pcompress >/dev/null 2>&1 || pcompress=$compress
 [ -z "$pcompress" ] && pcompress=$compress
 which $compress >/dev/null 2>&1 || { echo "Compression '$compress' not installed" && exit 12; }
 
-# iterate packages
+# prepare
 cd "$HOME/$PKG_PATH" || exit $?
 PKGLIST="$(ls ./*.tar.$extension)"
 
+# arg process
 fulllist=$(find . -name "*.tar.$extension" | sed "s|^\./||g;s|\.tar\.$extension$||g")
 if [ $# -ge 1 ]
 then
@@ -22,6 +23,8 @@ then
 else
   list=$fulllist
 fi
+
+# iterate
 for I in $list
 do
   TIME=$(stat -c "%Y" "$I.tar.$extension")
@@ -33,6 +36,8 @@ do
     echo "$I $TIME $DEPS" >> pkglist
   fi
 done
+
+# remove inexistant
 tmpfile="/tmp/pkglist_$(tr -cd '[:alnum:]' </dev/urandom | head -c10)"
 awk '{print $1}' pkglist | sort > "$tmpfile"
 for I in $(echo "$fulllist" | sort | diff --new-line-format="" --unchanged-line-format="" "$tmpfile" -)

server_scripts/gen_install.sh

@@ -12,7 +12,7 @@ cat .config >> install.sh
 echo '
 
 # resolve compression
-[ -z "$COMPRESSION" ] && COMPRESSION="xz:xz:pxz"
+[ -z "$COMPRESSION" ] && COMPRESSION="xz:xz:pixz"
 extension=$(echo "$COMPRESSION" | cut -d":" -f1)
 compress=$(echo "$COMPRESSION" | cut -d":" -f2)
 pcompress=$(echo "$COMPRESSION" | cut -d":" -f3)

src/config.sh

@@ -34,7 +34,7 @@ root_check && [ -z "$opt_f" ] && [ "$ALLOW_ROOT" != "true" ] && echo "Cannot run
 [ ! -d "$PKG_PATH" ] && $sudo mkdir -p "$PKG_PATH"
 
 # resolve compression
-[ -z "$COMPRESSION" ] && COMPRESSION="xz:xz:pxz"
+[ -z "$COMPRESSION" ] && COMPRESSION="xz:xz:pixz"
 extension=$(echo "$COMPRESSION" | cut -d':' -f1)
 compress=$(echo "$COMPRESSION" | cut -d':' -f2)
 pcompress=$(echo "$COMPRESSION" | cut -d':' -f3)

src/view.sh

@@ -52,7 +52,7 @@ is_installed()
 
 # $1 = file
 view_package_file() {
-  tree=$($pcompress -dc "$1" | tar -tf - 2>/dev/null) || exit $?
+  tree=$($pcompress -dc "$1" 2>/dev/null | tar -tf - 2>/dev/null) || exit $?
   echo "$tree" | grep -E '^ROOT/|^HOME/' | sed "/\/$/d ; s|^ROOT/|/|g ; s|^HOME/|$HOME/|g" 2>/dev/null
 }