From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Wed, 15 May 2019 21:07:55 +0000 (-0400)
Subject: Use zopfli to further compress source archives, when available.
X-Git-Tag: v2.3rc1~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9914f0fe309caf7b80ecc396c903cd93c8e166ab;p=thirdparty%2Fcups.git

Use zopfli to further compress source archives, when available.
---

diff --git a/scripts/makesrcdist b/scripts/makesrcdist
index 1ef0442ec..33b2f37cc 100755
--- a/scripts/makesrcdist
+++ b/scripts/makesrcdist
@@ -83,7 +83,7 @@ else
 fi
 
 fileurl=`echo $fileurl | sed -e '1,$s/\\//\\\\\\//g'`
-file="cups-$fileversion-source.tar.gz"
+file="$HOME/cups-$fileversion-source.tar"
 
 echo Exporting $fileversion...
 rm -rf $TMPDIR/cups-$version
@@ -100,15 +100,23 @@ rm -rf .gitignore
 cd ..
 
 echo Archiving...
-tar czf $file cups-$version
+tar cf $file cups-$version
+
+echo Compressing...
+if (which zopfli >/dev/null); then
+	zopfli $file
+	rm -f $file
+else
+	gzip -v9 $file
+fi
 
 if test $SIGNFILES = yes; then
 	echo Signing...
-	test -f $file.sig && rm -f $file.sig
-	gpg --detach-sign -u security@cups.org $file
+	test -f $file.gz.sig && rm -f $file.gz.sig
+	gpg --detach-sign -u security@cups.org $file.gz
 fi
 
 echo Removing temporary files...
 rm -rf cups-$version
 
-echo "Done - files in $TMPDIR."
+echo "Done - files in $HOME."