From b607b666b3da2120c64acf5353ddb4f58b64baad Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Sat, 4 Apr 2020 21:04:34 +0200 Subject: [PATCH] Improve XZ compression support Cleanup after upload, download scripts also supports this format Signed-off-by: Igor Pecovnik --- lib/build-all-ng.sh | 7 ++++--- lib/debootstrap.sh | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/build-all-ng.sh b/lib/build-all-ng.sh index 67cd381cc0..2b166acc48 100644 --- a/lib/build-all-ng.sh +++ b/lib/build-all-ng.sh @@ -98,12 +98,13 @@ pack_upload () if [[ $COMPRESS_OUTPUTIMAGE == *gz* ]]; then display_alert "Compressing" "$DEST/images/${version}.img.gz" "info" - pigz < $DESTIMG/${version}.img > ${DESTIMG}/${version}.img.gz + pigz $DESTIMG/${version}.img fi -if [[ $COMPRESS_OUTPUTIMAGE == *xz* ]]; then + if [[ $COMPRESS_OUTPUTIMAGE == *xz* ]]; then display_alert "Compressing" "$DEST/images/${version}.img.xz" "info" - pixz < $DESTIMG/${version}.img > ${DESTIMG}/${version}.img.xz + pixz -3 < $DESTIMG/${version}.img > ${DESTIMG}/${version}.img.xz + find $DESTIMG -type f -name '${version}.img' -print0 | xargs -0 rm -- fi if [[ -n "${SEND_TO_SERVER}" ]]; then diff --git a/lib/debootstrap.sh b/lib/debootstrap.sh index c70bc35218..1bd5594a20 100644 --- a/lib/debootstrap.sh +++ b/lib/debootstrap.sh @@ -656,12 +656,13 @@ create_image() if [[ $COMPRESS_OUTPUTIMAGE == *gz* ]]; then display_alert "Compressing" "$DEST/images/${version}.img.gz" "info" - pigz < $DESTIMG/${version}.img > $DEST/images/${version}.img.gz + pigz $DESTIMG/${version}.img fi if [[ $COMPRESS_OUTPUTIMAGE == *xz* ]]; then display_alert "Compressing" "$DEST/images/${version}.img.xz" "info" - pixz < $DESTIMG/${version}.img > $DEST/images/${version}.img.xz + pixz -3 < $DESTIMG/${version}.img > $DEST/images/${version}.img.xz + find $DESTIMG -type f -name '${version}.img' -print0 | xargs -0 rm -- fi mv $DESTIMG/${version}.img.txt $DEST/images/${version}.img.txt || exit 1