Changes to compensate for the lack of Shorewall-perl

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9537 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2009-02-26 15:26:06 +00:00
parent f238b6a5aa
commit a939b07f49
2 changed files with 5 additions and 10 deletions

View File

@ -162,8 +162,8 @@ if [ -n "$PREFIX" ]; then
install -d $OWNERSHIP -m 755 ${PREFIX}${DEST}
fi
else
[ -x /usr/share/shorewall-perl/compiler.pl ] || \
{ echo " ERROR: Shorewall-perl is not installed" >&2; exit 1; }
[ -x /usr/share/shorewall/compiler.pl ] || \
{ echo " ERROR: Shorewall >= 4.3.5 is not installed" >&2; exit 1; }
if [ -z "$CYGWIN" ]; then
if [ -d /etc/apt -a -e /usr/bin/dpkg ]; then
DEBIAN=yes

View File

@ -624,14 +624,9 @@ dump_command() {
clear_term
echo "$PRODUCT $version Dump at $HOSTNAME - $(date)"
echo
if [ -f /usr/share/shorewall6-shell/version ]; then
echo " Shorewall6-shell $(cat /usr/share/shorewall6-shell/version)"
if [ -f /usr/share/shorewall6-perl/version ]; then
echo " Shorewall6-perl $(cat /usr/share/shorewall6-perl/version)"
fi
echo
elif [ -f /usr/share/shorewall6-perl/version ]; then
echo " Shorewall6-perl $(cat /usr/share/shorewall6-perl/version)"
if [ -f /usr/share/shorewall/version ]; then
echo " Shorewall $(cat /usr/share/shorewall/version)"
echo
fi