summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFredrik Rinnestam <fredrik@crux.nu>2018-11-17 21:11:16 +0100
committerFredrik Rinnestam <fredrik@crux.nu>2018-11-17 21:11:16 +0100
commit9ca0da65121451447cdd284f98027dca2e16fb2e (patch)
tree431b5f09971067e7ec743f45f83ad36ea6248a77
parentd51cdd1c8f24ef6f53cb87a0d06f4066cd91af8c (diff)
downloadpkgutils-9ca0da65121451447cdd284f98027dca2e16fb2e.tar.gz
pkgutils-9ca0da65121451447cdd284f98027dca2e16fb2e.tar.xz
readd bz2 support - don't commit while drunk
-rw-r--r--pkgmk.conf.5.in2
-rwxr-xr-xpkgmk.in3
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgmk.conf.5.in b/pkgmk.conf.5.in
index 786da57e..98976d61 100644
--- a/pkgmk.conf.5.in
+++ b/pkgmk.conf.5.in
@@ -84,7 +84,7 @@ If set to 'no', pkgmk will strip built binaries.
Default: 'no'
.TP
\fBPKGMK_COMPRESSION_MODE='STRING'\fP
-Option to select the mode used to compress the packages. Valid strings are gz, xz and lz.
+Option to select the mode used to compress the packages. Valid strings are gz, bz2, xz and lz.
.br
Default: 'gz'
.SH SEE ALSO
diff --git a/pkgmk.in b/pkgmk.in
index a4d91c73..7b88fb1a 100755
--- a/pkgmk.in
+++ b/pkgmk.in
@@ -550,6 +550,7 @@ build_package() {
case $PKGMK_COMPRESSION_MODE in
gz) COMPRESSION="-z" ;;
+ bz2) COMPRESSION="-j" ;;
xz) COMPRESSION="-J" ;;
lz) COMPRESSION="--lzip" ;;
esac
@@ -821,7 +822,7 @@ main() {
check_pkgfile
case $PKGMK_COMPRESSION_MODE in
- gz|xz|lz)
+ gz|bz2|xz|lz)
TARGET="$PKGMK_PACKAGE_DIR/$name#$version-$release.pkg.tar.$PKGMK_COMPRESSION_MODE"
;;
*)

Generated by cgit