Fix dot-release build to build correct tar.bz2 file

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8159 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2008-02-07 17:05:44 +00:00
parent f91d70a958
commit 898ea78d18

View File

@ -507,10 +507,10 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
progress_message "Creating $DIR/$TARBALL..." progress_message "Creating $DIR/$TARBALL..."
rm -f $SHOREWALLDIR/*.diff rm -f $SHOREWALLDIR/*.diff
do_or_die "tar -zcvf $TARBALL $SHOREWALLDIR >> $LOGFILE 2>&1" do_or_die "tar -zcvf $TARBALL $SHOREWALLDIR >> $LOGFILE 2>&1"
do_or_die "tar -jcvf shorewall-common-${BASEVERSION}.tar.bz2 $SHOREWALLDIR >> $LOGFILE 2>&1" do_or_die "tar -jcvf shorewall-common-${VERSION}.tar.bz2 $SHOREWALLDIR >> $LOGFILE 2>&1"
if [ -n "$SIGN" ]; then if [ -n "$SIGN" ]; then
for shoresuffix in tgz tar.bz2; do for shoresuffix in tgz tar.bz2; do
shoreball=shorewall-common-${BASEVERSION}.${shoresuffix} shoreball=shorewall-common-${VERSION}.${shoresuffix}
report "GPG signing $DIR/$shoreball" report "GPG signing $DIR/$shoreball"
rm -f ${shoreball}.asc rm -f ${shoreball}.asc
do_or_die "$GPG $shoreball" do_or_die "$GPG $shoreball"
@ -522,10 +522,10 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
progress_message "Creating $DIR/$LITETARBALL..." progress_message "Creating $DIR/$LITETARBALL..."
rm -f $SHOREWALLLITEDIR/*.diff rm -f $SHOREWALLLITEDIR/*.diff
do_or_die "tar -zcvf $LITETARBALL $SHOREWALLLITEDIR >> $LOGFILE 2>&1" do_or_die "tar -zcvf $LITETARBALL $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
do_or_die "tar -jcvf shorewall-lite-${BASEVERSION}.tar.bz2 $SHOREWALLLITEDIR >> $LOGFILE 2>&1" do_or_die "tar -jcvf shorewall-lite-${VERSION}.tar.bz2 $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
if [ -n "$SIGN" ]; then if [ -n "$SIGN" ]; then
for shoresuffix in tgz tar.bz2; do for shoresuffix in tgz tar.bz2; do
shoreball=shorewall-lite-${BASEVERSION}.${shoresuffix} shoreball=shorewall-lite-${VERSION}.${shoresuffix}
report "GPG signing $DIR/$shoreball" report "GPG signing $DIR/$shoreball"
rm -f ${shoreball}.asc rm -f ${shoreball}.asc
do_or_die "$GPG $shoreball" do_or_die "$GPG $shoreball"
@ -537,11 +537,11 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
progress_message "Creating $DIR/$PERLTARBALL..." progress_message "Creating $DIR/$PERLTARBALL..."
rm -f $PERLDIR/*.diff rm -f $PERLDIR/*.diff
do_or_die "tar -zcvf $PERLTARBALL $PERLDIR >> $LOGFILE 2>&1" do_or_die "tar -zcvf $PERLTARBALL $PERLDIR >> $LOGFILE 2>&1"
do_or_die "tar -jcvf shorewall-perl-${BASEVERSION}.tar.bz2 $PERLDIR >> $LOGFILE 2>&1" do_or_die "tar -jcvf shorewall-perl-${VERSION}.tar.bz2 $PERLDIR >> $LOGFILE 2>&1"
if [ -n "$SIGN" ]; then if [ -n "$SIGN" ]; then
for shoresuffix in tgz tar.bz2; do for shoresuffix in tgz tar.bz2; do
shoreball=shorewall-perl-${BASEVERSION}.${shoresuffix} shoreball=shorewall-perl-${VERSION}.${shoresuffix}
report "GPG signing $DIR/$shoreball" report "GPG signing $DIR/$shoreball"
rm -f ${shoreball}.asc rm -f ${shoreball}.asc
do_or_die "$GPG $shoreball" do_or_die "$GPG $shoreball"
@ -553,11 +553,11 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
progress_message "Creating $DIR/$SHELLTARBALL..." progress_message "Creating $DIR/$SHELLTARBALL..."
rm -f $SHELLDIR/*.diff rm -f $SHELLDIR/*.diff
do_or_die "tar -zcvf $SHELLTARBALL $SHELLDIR >> $LOGFILE 2>&1" do_or_die "tar -zcvf $SHELLTARBALL $SHELLDIR >> $LOGFILE 2>&1"
do_or_die "tar -jcvf shorewall-shell-${BASEVERSION}.tar.bz2 $SHELLDIR >> $LOGFILE 2>&1" do_or_die "tar -jcvf shorewall-shell-${VERSION}.tar.bz2 $SHELLDIR >> $LOGFILE 2>&1"
if [ -n "$SIGN" ]; then if [ -n "$SIGN" ]; then
for shoresuffix in tgz tar.bz2; do for shoresuffix in tgz tar.bz2; do
shoreball=shorewall-shell-${BASEVERSION}.${shoresuffix} shoreball=shorewall-shell-${VERSION}.${shoresuffix}
report "GPG signing $DIR/$shoreball" report "GPG signing $DIR/$shoreball"
rm -f ${shoreball}.asc rm -f ${shoreball}.asc
do_or_die "$GPG $shoreball" do_or_die "$GPG $shoreball"