configurable GNU tar

This commit is contained in:
Florian Haftmann 2015-06-03 17:29:11 +02:00 committed by Michael Weghorn
parent 6f354d125b
commit 77b9ba2e6e
3 changed files with 11 additions and 8 deletions

View file

@ -21,6 +21,7 @@ rpm_rpmbuild=/usr/local/bin/rpmbuild
deb=deb/projectlibre
debroot=deb
dpkg_deb=/opt/local/bin/dpkg-deb
gnu_tar=gnutar
macapp=ProjectLibre.app

View file

@ -381,8 +381,9 @@
<arg value="${user.name}"/>
<arg value="${debroot}"/>
</exec-->
<exec executable="sh"> <!-- dpkg-deb package with wheel group on Mac OS X is causing check issues on Ubuntu. Workaround to put numeric owner group in tars. requires gnutar -->
<exec executable="sh"> <!-- dpkg-deb package with wheel group on Mac OS X is causing check issues on Ubuntu. Workaround to put numeric owner group in tars. requires GNU tar -->
<arg value="resources/deb/cleandeb.sh"/>
<arg value="${gnu_tar}"/>
<arg value="${basedir}/${debroot}"/>
<arg value="projectlibre_${deb_version}-${deb_revision}.deb"/>
<arg value="projectlibre_${deb_version}-${deb_revision}.deb"/>

View file

@ -1,15 +1,16 @@
P="$1"
DEB="$2"
DEB2="$3"
GNU_TAR="$1"
P="$2"
DEB="$3"
DEB2="$4"
cd "$P"
mkdir -p "$P"/tmp
cd "$P"/tmp
ar -x "$P"/"$DEB"
gnutar -xzvf control.tar.gz
gnutar -xzvf data.tar.gz
gnutar --numeric-owner --owner=0 --group=0 -czvf control.tar.gz control postinst postrm
gnutar --numeric-owner --owner=0 --group=0 -czvf data.tar.gz usr
"${GNU_TAR}" -xzvf control.tar.gz
"${GNU_TAR}" -xzvf data.tar.gz
"${GNU_TAR}" --numeric-owner --owner=0 --group=0 -czvf control.tar.gz control postinst postrm
"${GNU_TAR}" --numeric-owner --owner=0 --group=0 -czvf data.tar.gz usr
ar -r "$P"/"$DEB2" debian-binary control.tar.gz data.tar.gz
cd ..
rm -rf tmp