Fix makeshorewall script

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4462 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-08-27 20:49:16 +00:00
parent 2d8ca650ee
commit 55f0a82277

View File

@ -284,11 +284,6 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
report "Lite SVN tag is $LITESVNBRANCH" report "Lite SVN tag is $LITESVNBRANCH"
[ -n "$BUILDTARBALL" ] && report "TARBALL is $TARBALL" && report "LITETARBALL is $LITETARBALL" [ -n "$BUILDTARBALL" ] && report "TARBALL is $TARBALL" && report "LITETARBALL is $LITETARBALL"
[ -n "$BUILDRPM" ] && report "RPM is $RPMNAME" && report "LITERPM is $LITERPMNAME" [ -n "$BUILDRPM" ] && report "RPM is $RPMNAME" && report "LITERPM is $LITERPMNAME"
[ -n "$XLIBS" ] && report "Excluding the following run-time libraries: $XLIBS"
[ -n "$XCLIBS" ] && report "Excluding the following compiler libraries: $XCLIBS"
[ -n "$CONFIGFILES" ] && report "Including configuration files in /usr/share/shorewall/" || report "Excluding configuration files from /usr/share/shorewall/"
[ -n "$SAMPLES" ] && report "Including samples in /usr/share/shorewall/" || report "Excluding samples from /usr/share/shorewall/"
[ -n "$MACROS" ] && report "Including macros in /usr/share/shorewall/" || report "Excluding macros from /usr/share/shorewall/"
fi fi
[ -n "$BUILDHTML" ] && report "HTML Directory is $HTMLDIR" [ -n "$BUILDHTML" ] && report "HTML Directory is $HTMLDIR"
@ -316,15 +311,11 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
fgrep VERSION=$VERSION $SHOREWALLLITEDIR/fallback.sh > /dev/null 2>&1 || fatal_error "Lite fallback.sh has wrong version" fgrep VERSION=$VERSION $SHOREWALLLITEDIR/fallback.sh > /dev/null 2>&1 || fatal_error "Lite fallback.sh has wrong version"
fi fi
if [ -n "$SAMPLES" ]; then
if [ -n "$SAMPLESTAG" ]; then if [ -n "$SAMPLESTAG" ]; then
cd $SHOREWALLDIR cd $SHOREWALLDIR
do_or_die "svn export --non-interactive --force https://svn.sourceforge.net/svnroot/shorewall/$SAMPLESTAG Samples >> $LOGFILE 2>&1" do_or_die "svn export --non-interactive --force https://svn.sourceforge.net/svnroot/shorewall/$SAMPLESTAG Samples >> $LOGFILE 2>&1"
cd $DIR cd $DIR
fi fi
else
perl -p -w -i -e "s|Samples||" $SHOREWALLDIR/shorewall.spec
fi
do_or_die "rm -rf $SHOREWALLDIR/debian" do_or_die "rm -rf $SHOREWALLDIR/debian"