diff --git a/.config.example b/.config.example index 93b7644..2d5c025 100644 --- a/.config.example +++ b/.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 diff --git a/README.md b/README.md index 6761b2f..e6df8c7 100644 --- a/README.md +++ b/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 diff --git a/server_deploy.sh b/server_deploy.sh index ef4e973..a2e7c32 100755 --- a/server_deploy.sh +++ b/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) diff --git a/server_scripts/database_update.sh b/server_scripts/database_update.sh index 3813597..e04b529 100755 --- a/server_scripts/database_update.sh +++ b/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:]' "$tmpfile" for I in $(echo "$fulllist" | sort | diff --new-line-format="" --unchanged-line-format="" "$tmpfile" -) diff --git a/server_scripts/gen_install.sh b/server_scripts/gen_install.sh index c0535d1..d8645d7 100755 --- a/server_scripts/gen_install.sh +++ b/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) diff --git a/src/config.sh b/src/config.sh index f292dc2..110bd86 100644 --- a/src/config.sh +++ b/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) diff --git a/src/view.sh b/src/view.sh index b8c5ba7..ce42ecc 100644 --- a/src/view.sh +++ b/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 }