From 385bc30e7e626bc3cb453eed2fd55f715f28689a Mon Sep 17 00:00:00 2001
From: Tom Reynolds <tomreyn@users.sourceforge.net>
Date: Sun, 26 May 2013 02:16:01 +0000
Subject: [PATCH] Do not use enforce use of extreme (-9e) XZ compression
 everywhere. Instead use XZ_OPT="$XZ_OPT -9e" environment variable as a prefix
 when calling XZ commands, or use XZ_DEFAULTS environment variable in shell
 initialization scripts. See xz(1) for details.

---
 mk/linux/make-binary-archive.sh                | 7 +++++--
 mk/linux/make-data-archive.sh                  | 7 +++++--
 mk/linux/makedata-diff.sh                      | 6 +++++-
 mk/linux/makedata-source.sh                    | 5 ++++-
 mk/linux/makedata.sh                           | 5 ++++-
 mk/linux/mojosetup/megaglest-installer/make.sh | 7 +++++--
 6 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/mk/linux/make-binary-archive.sh b/mk/linux/make-binary-archive.sh
index 31c6cf9d4..8b740ffc8 100755
--- a/mk/linux/make-binary-archive.sh
+++ b/mk/linux/make-binary-archive.sh
@@ -7,6 +7,9 @@
 # set this to non 0 to skip building the binary
 skipbinarybuild=0
 
+# Consider setting this for small packages if there's plenty of RAM and CPU available:
+#export XZ_OPT="$XZ_OPT -9e"
+
 VERSION=`./mg-version.sh --version`
 kernel=`uname -s | tr '[A-Z]' '[a-z]'`
 architecture=`uname -m  | tr '[A-Z]' '[a-z]'`
@@ -68,9 +71,9 @@ echo "creating $PACKAGE"
 cd $CURRENTDIR
 [[ -f "$release/$PACKAGE" ]] && rm "release/$PACKAGE"
 #tar cJf "release/$PACKAGE" -C "$CURRENTDIR/release/" "$RELEASENAME-$VERSION"
-#tar -cf - -C "$CURRENTDIR/release/$RELEASENAME-$VERSION/" "./" | xz -9e > release/$PACKAGE
+#tar -cf - -C "$CURRENTDIR/release/$RELEASENAME-$VERSION/" "./" | xz > release/$PACKAGE
 cd release/$RELEASENAME-$VERSION/
-tar -cf - * | xz -9e > ../$PACKAGE
+tar -cf - * | xz > ../$PACKAGE
 cd $CURRENTDIR
 # 7z a -mmt -mx=9 -ms=on -mhc=on "release/$PACKAGE" "$CURRENTDIR/release/$RELEASENAME-$VERSION"
 
diff --git a/mk/linux/make-data-archive.sh b/mk/linux/make-data-archive.sh
index ec05ac181..d1017284d 100755
--- a/mk/linux/make-data-archive.sh
+++ b/mk/linux/make-data-archive.sh
@@ -4,6 +4,9 @@
 # Written by Mark Vejvoda <mark_vejvoda@hotmail.com>
 # Copyright (c) 2011 Mark Vejvoda under GNU GPL v3.0+
 
+# Consider setting this for small packages if there's plenty of RAM and CPU available:
+#export XZ_OPT="$XZ_OPT -9e"
+
 VERSION=`./mg-version.sh --version`
 RELEASENAME=megaglest-standalone-data
 #PACKAGE="$RELEASENAME-$VERSION.7z"
@@ -65,9 +68,9 @@ svn export --force "$CURRENTDIR/../../source/masterserver/flags" "$RELEASEDIR/da
 echo "creating data archive: $PACKAGE"
 [[ -f "$release/$PACKAGE" ]] && rm "release/$PACKAGE"
 #tar cJf "release/$PACKAGE" -C "$CURRENTDIR/release/" "$RELEASENAME-$VERSION"
-#tar -cf - -C "$CURRENTDIR/release/$RELEASENAME-$VERSION/" "megaglest-$VERSION" | xz -9e > release/$PACKAGE
+#tar -cf - -C "$CURRENTDIR/release/$RELEASENAME-$VERSION/" "megaglest-$VERSION" | xz > release/$PACKAGE
 cd $CURRENTDIR/release/$RELEASENAME-$VERSION
-tar -cf - * | xz -9e > ../$PACKAGE
+tar -cf - * | xz > ../$PACKAGE
 cd $CURRENTDIR
 # 7z a -mmt -mx=9 -ms=on -mhc=on "release/$PACKAGE" "$CURRENTDIR/release/$RELEASENAME-$VERSION"
 
diff --git a/mk/linux/makedata-diff.sh b/mk/linux/makedata-diff.sh
index d10882a9f..d2020f6b9 100755
--- a/mk/linux/makedata-diff.sh
+++ b/mk/linux/makedata-diff.sh
@@ -6,6 +6,10 @@
 
 # This script compares two mega-glest data content folders for file differences, 
 # then creates an archive of ONLY the differences (including files ONLY in new version)
+
+# Consider setting this for small packages if there's plenty of RAM and CPU available:
+#export XZ_OPT="$XZ_OPT -9e"
+
 OLD_VERSION=`./mg-version.sh --oldversion`
 VERSION=`./mg-version.sh --version`
 NEW_SUBFOLDER_PATH="megaglest-$VERSION"
@@ -95,7 +99,7 @@ files_list=`cat ../megaglest-data-$VERSION-fileslist.txt`
 echo Current Folder is [`pwd`]
 #echo 7za a "../$RELEASENAME.7z" $files_list
 #7za a -mx=9 -ms=on -mhc=on "../$RELEASENAME.7z" $files_list
-tar -cf - --add-file $files_list | xz -9e > ../$RELEASENAME.tar.xz
+tar -cf - --add-file $files_list | xz > ../$RELEASENAME.tar.xz
 
 cd ..
 
diff --git a/mk/linux/makedata-source.sh b/mk/linux/makedata-source.sh
index 9bca79580..3f5b22c7a 100755
--- a/mk/linux/makedata-source.sh
+++ b/mk/linux/makedata-source.sh
@@ -4,6 +4,9 @@
 # Written by Mark Vejvoda <mark_vejvoda@hotmail.com>
 # Copyright (c) 2011 Mark Vejvoda under GNU GPL v3.0+
 
+# Consider setting this for small packages if there's plenty of RAM and CPU available:
+#export XZ_OPT="$XZ_OPT -9e"
+
 VERSION=`./mg-version.sh --version`
 RELEASENAME=megaglest-data-source
 #PACKAGE="$RELEASENAME-$VERSION.7z"
@@ -33,7 +36,7 @@ svn export --force "$CURRENTDIR/../../../trunk-data-source" "$RELEASEDIR/data-so
 echo "creating $PACKAGE"
 [[ -f "$release/$PACKAGE" ]] && rm "release/$PACKAGE"
 #tar cJf "release/$PACKAGE" -C "$CURRENTDIR/release/" "$RELEASENAME-$VERSION"
-tar -cf - -C "$CURRENTDIR/release/$RELEASENAME-$VERSION/" "megaglest-$VERSION" | xz -9e > release/$PACKAGE
+tar -cf - -C "$CURRENTDIR/release/$RELEASENAME-$VERSION/" "megaglest-$VERSION" | xz > release/$PACKAGE
 # 7z a -mmt -mx=9 -ms=on -mhc=on "release/$PACKAGE" "$CURRENTDIR/release/$RELEASENAME-$VERSION"
 
 ls -la release/$PACKAGE
diff --git a/mk/linux/makedata.sh b/mk/linux/makedata.sh
index 7607b4c99..4727d3ab7 100755
--- a/mk/linux/makedata.sh
+++ b/mk/linux/makedata.sh
@@ -4,6 +4,9 @@
 # Written by Mark Vejvoda <mark_vejvoda@hotmail.com>
 # Copyright (c) 2011 Mark Vejvoda under GNU GPL v3.0+
 
+# Consider setting this for small packages if there's plenty of RAM and CPU available:
+#export XZ_OPT="$XZ_OPT -9e"
+
 VERSION=`./mg-version.sh --version`
 RELEASENAME=megaglest-data
 #PACKAGE="$RELEASENAME-$VERSION.7z"
@@ -63,7 +66,7 @@ rm -rf "$RELEASEDIR/data/core/fonts"
 echo "creating $PACKAGE"
 [[ -f "$release/$PACKAGE" ]] && rm "release/$PACKAGE"
 #tar cJf "release/$PACKAGE" -C "$CURRENTDIR/release/" "$RELEASENAME-$VERSION"
-tar -cf - -C "$CURRENTDIR/release/$RELEASENAME-$VERSION/" "megaglest-$VERSION" | xz -9e > release/$PACKAGE
+tar -cf - -C "$CURRENTDIR/release/$RELEASENAME-$VERSION/" "megaglest-$VERSION" | xz > release/$PACKAGE
 # 7z a -mmt -mx=9 -ms=on -mhc=on "release/$PACKAGE" "$CURRENTDIR/release/$RELEASENAME-$VERSION"
 
 ls -la release/$PACKAGE
diff --git a/mk/linux/mojosetup/megaglest-installer/make.sh b/mk/linux/mojosetup/megaglest-installer/make.sh
index f5e3983c6..006d2a8a9 100755
--- a/mk/linux/mojosetup/megaglest-installer/make.sh
+++ b/mk/linux/mojosetup/megaglest-installer/make.sh
@@ -14,6 +14,9 @@
 
 # below is the branch to build and installer from.
 
+# Consider setting this for small packages if there's plenty of RAM and CPU available:
+#export XZ_OPT="$XZ_OPT -9e"
+
 megaglest_release_folder=""
 #megaglest_release_folder="trunk"
 #megaglest_release_folder="release-3.3.5.1"
@@ -75,7 +78,7 @@ fi
 #    { "txz", MojoArchive_createTAR, true },
 # };
 #
-#megaglest_archiver_app_data='tar -cf - * | xz -9e > mgdata.tar.xz'
+#megaglest_archiver_app_data='tar -cf - * | xz > mgdata.tar.xz'
 megaglest_archivefilename_data="mgdata.tar.xz"
 
 #megaglest_archiver_app="zip -9r "
@@ -327,7 +330,7 @@ cd ../megaglest-installer
 # Compress the main data archive
 cd data
 #${megaglest_archiver_app_data} ${megaglest_archivefilename_data}
-tar -cf - * | xz -9e > $megaglest_archivefilename_data
+tar -cf - * | xz > $megaglest_archivefilename_data
 # now remove everything except for the docs folder and the data archive
 shopt -s extglob
 rm -rf !(docs|$megaglest_archivefilename_data)