Don't compress linux bundle, compress installer (with xz)
This halves the installer size from about 60MB to 29MB.
This commit is contained in:
parent
d0126be806
commit
6fa25a1258
|
@ -741,8 +741,8 @@ fi
|
||||||
|
|
||||||
echo "Building tarball ..."
|
echo "Building tarball ..."
|
||||||
|
|
||||||
rm -f $APPDIR.tar.bz2
|
rm -f $APPDIR.tar
|
||||||
tar -cjf $APPDIR.tar.bz2 $APPDIR
|
tar -cf $APPDIR.tar $APPDIR
|
||||||
|
|
||||||
echo "Calculating bundle size"
|
echo "Calculating bundle size"
|
||||||
du -sb $APPDIR/ | awk '{print $1}' > $APPDIR.size
|
du -sb $APPDIR/ | awk '{print $1}' > $APPDIR.size
|
||||||
|
|
|
@ -75,9 +75,9 @@ if [ ! -z ${BUILDTYPE} ]; then
|
||||||
X86_64_BUNDLE="${X86_64_BUNDLE}-${BUILDTYPE}"
|
X86_64_BUNDLE="${X86_64_BUNDLE}-${BUILDTYPE}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -e ${X86_BUNDLE}.tar.bz2 ] ; then
|
if [ ! -e ${X86_BUNDLE}.tar ] ; then
|
||||||
echo ""
|
echo ""
|
||||||
echo "Can't locate x86 bundle file ${X86_BUNDLE}.tar.bz2"
|
echo "Can't locate x86 bundle file ${X86_BUNDLE}.tar"
|
||||||
echo ""
|
echo ""
|
||||||
elif [ ! -e ${X86_BUNDLE}.size ] ; then
|
elif [ ! -e ${X86_BUNDLE}.size ] ; then
|
||||||
echo ""
|
echo ""
|
||||||
|
@ -87,9 +87,9 @@ else
|
||||||
X86_BUNDLE_OK="T"
|
X86_BUNDLE_OK="T"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -e ${X86_64_BUNDLE}.tar.bz2 ]; then
|
if [ ! -e ${X86_64_BUNDLE}.tar ]; then
|
||||||
echo ""
|
echo ""
|
||||||
echo "Can't locate x86_64 bundle file ${X86_64_BUNDLE}.tar.bz2"
|
echo "Can't locate x86_64 bundle file ${X86_64_BUNDLE}.tar"
|
||||||
echo ""
|
echo ""
|
||||||
elif [ ! -e ${X86_64_BUNDLE}.size ]; then
|
elif [ ! -e ${X86_64_BUNDLE}.size ]; then
|
||||||
echo ""
|
echo ""
|
||||||
|
@ -148,7 +148,7 @@ fi
|
||||||
|
|
||||||
echo "Cleaning up any old package files for this build"
|
echo "Cleaning up any old package files for this build"
|
||||||
#Get rid of any old packages of this same name.
|
#Get rid of any old packages of this same name.
|
||||||
rm -f ${PACKAGE}.tar.bz2
|
rm -f ${PACKAGE}.tar
|
||||||
rm -rf ${PACKAGE}
|
rm -rf ${PACKAGE}
|
||||||
|
|
||||||
|
|
||||||
|
@ -156,12 +156,12 @@ echo "Creating new package dir..."
|
||||||
mkdir ${PACKAGE}
|
mkdir ${PACKAGE}
|
||||||
|
|
||||||
if [ "${X86_BUNDLE_OK}" = "T" ]; then
|
if [ "${X86_BUNDLE_OK}" = "T" ]; then
|
||||||
mv ${X86_BUNDLE}.tar.bz2 ${PACKAGE}
|
mv ${X86_BUNDLE}.tar ${PACKAGE}
|
||||||
mv ${X86_BUNDLE}.size ${PACKAGE}/.${X86_BUNDLE}.size
|
mv ${X86_BUNDLE}.size ${PACKAGE}/.${X86_BUNDLE}.size
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${X86_64_BUNDLE_OK}" = "T" ]; then
|
if [ "${X86_64_BUNDLE_OK}" = "T" ]; then
|
||||||
mv ${X86_64_BUNDLE}.tar.bz2 ${PACKAGE}
|
mv ${X86_64_BUNDLE}.tar ${PACKAGE}
|
||||||
mv ${X86_64_BUNDLE}.size ${PACKAGE}/.${X86_64_BUNDLE}.size
|
mv ${X86_64_BUNDLE}.size ${PACKAGE}/.${X86_64_BUNDLE}.size
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -181,7 +181,7 @@ fi
|
||||||
|
|
||||||
if test -n "$MAKESELF"; then
|
if test -n "$MAKESELF"; then
|
||||||
echo "Creating self-extracting installer"
|
echo "Creating self-extracting installer"
|
||||||
$MAKESELF --nocomp ${PACKAGE}/ ${PACKAGE}.run ${APPNAME} ./install.sh
|
$MAKESELF --xz --complevel 9 ${PACKAGE}/ ${PACKAGE}.run ${APPNAME} ./install.sh
|
||||||
else
|
else
|
||||||
echo "Creating tarball..."
|
echo "Creating tarball..."
|
||||||
tar -cf ${PACKAGE}.tar ${PACKAGE}
|
tar -cf ${PACKAGE}.tar ${PACKAGE}
|
||||||
|
|
|
@ -336,7 +336,7 @@ echo "Bundle is on ${FILESYSTEM_TYPE} filesystem"
|
||||||
# untar the correct bundle for us to install
|
# untar the correct bundle for us to install
|
||||||
echo "Unpacking bundle for $ARCH"
|
echo "Unpacking bundle for $ARCH"
|
||||||
|
|
||||||
if [ ! -e ${PGM_NAME}_${ARCH}-*.tar.bz2 ]; then
|
if [ ! -e ${PGM_NAME}_${ARCH}-*.tar ]; then
|
||||||
echo ""
|
echo ""
|
||||||
echo "!!! ERROR !!! Can't locate ${ARCH} bundle file."
|
echo "!!! ERROR !!! Can't locate ${ARCH} bundle file."
|
||||||
echo ""
|
echo ""
|
||||||
|
@ -344,7 +344,7 @@ if [ ! -e ${PGM_NAME}_${ARCH}-*.tar.bz2 ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! tar -xjf ${PGM_NAME}_${ARCH}-*.tar.bz2; then
|
if ! tar -xf ${PGM_NAME}_${ARCH}-*.tar; then
|
||||||
echo ""
|
echo ""
|
||||||
echo "!!! ERROR !!! Can't unpack ${ARCH} bundle file."
|
echo "!!! ERROR !!! Can't unpack ${ARCH} bundle file."
|
||||||
echo ""
|
echo ""
|
||||||
|
|
Loading…
Reference in New Issue
Block a user