Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@ jobs:
if: matrix.container == 'ubuntu:latest'
run: |
apt update
apt -y install git make pbzip2 binutils bzip2 zstd gnupg openssl
apt -y install git make pbzip2 binutils bzip2 zstd gnupg openssl zopfli

- name: Install RockyLinux packages
if: matrix.container == 'rockylinux:9'
run: |
dnf groupinstall -y "Development Tools" "RPM Development Tools"
dnf install -y zstd binutils binutils-devel gnupg2 pbzip2 openssl
dnf install -y zstd binutils binutils-devel gnupg2 pbzip2 openssl zopfli

- name: Install Alpine packages
if: matrix.container == 'alpine:latest'
run: apk add --no-cache bash git make libarchive-tools gnupg coreutils binutils bzip2 zstd openssl
run: apk add --no-cache bash git make libarchive-tools gnupg coreutils binutils bzip2 zstd openssl zopfli

- name: Install macOS packages
if: runner.os == 'macOS'
Expand Down
3 changes: 3 additions & 0 deletions makeself.1
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ Compress using lz4.
.B --pigz
Compress using pigz.
.TP
.B --zopfli
Compress using zopfli.
.TP
.B --zstd
Compress using zstd.
.TP
Expand Down
9 changes: 9 additions & 0 deletions makeself.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ MS_Usage()
echo " --quiet | -q : Do not print any messages other than errors."
echo " --gzip : Compress using gzip (default if detected)"
echo " --pigz : Compress with pigz"
echo " --zopfli : Compress with zopfli"
echo " --zstd : Compress with zstd"
echo " --bzip2 : Compress using bzip2 instead of gzip"
echo " --pbzip2 : Compress using pbzip2 instead of gzip"
Expand Down Expand Up @@ -217,6 +218,10 @@ do
COMPRESS=pigz
shift
;;
--zopfli)
COMPRESS=zopfli
shift
;;
--zstd)
COMPRESS=zstd
shift
Expand Down Expand Up @@ -512,6 +517,10 @@ pigz)
fi
GUNZIP_CMD="gzip -cd"
;;
zopfli)
GZIP_CMD="zopfli -c"
GUNZIP_CMD="gzip -cd"
;;
zstd)
GZIP_CMD="zstd -$COMPRESS_LEVEL"
if test $THREADS -ne $DEFAULT_THREADS; then # Leave as the default if threads not indicated
Expand Down
10 changes: 10 additions & 0 deletions test/extracttest
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,16 @@ testZstd()
assertEquals $? 0
}

testZopfli()
{
# Skip if zopfli is not available
which zopfli || startSkipping
setupTests --zopfli
Comment thread
megastep marked this conversation as resolved.

./makeself-test.run --check
assertEquals $? 0
}

# Load and run shUnit2.
source "./shunit2/shunit2"

Loading