holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Establish default product based on $0

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2016-12-18 11:18:07 -08:00
parent 7ce5c31c68
commit 089ff4eb33
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall-core/lib.cli
View File

@ -4531,7 +4531,7 @@ shorewall_cli() {
usage 1 usage 1
fi fi
setup_product_environment 1 setup_product_environment
[ -n "$g_lite" ] || . ${SHAREDIR}/shorewall/lib.cli-std [ -n "$g_lite" ] || . ${SHAREDIR}/shorewall/lib.cli-std

36
Shorewall-core/lib.core
View File

@ -35,7 +35,7 @@ fatal_error() # $@ = Message
exit 2 exit 2
} }
setup_product_environment() { # $1 -- if non-empty, source shorewallrc setup_product_environment() {
g_basedir=${SHAREDIR}/shorewall g_basedir=${SHAREDIR}/shorewall
g_sharedir="$SHAREDIR"/$PRODUCT g_sharedir="$SHAREDIR"/$PRODUCT
@ -88,15 +88,31 @@ setup_product_environment() { # $1 -- if non-empty, source shorewallrc
} }
set_default_product() { set_default_product() {
if [ -f ${g_basedir}/version ]; then case $(basename $0) in
PRODUCT=shorewall shorewall6)
elif [ -f ${SHAREDIR}/shorewall-lite/version ]; then PRODUCT=shorewall6
PRODUCT=shorewall-lite ;;
elif [ -f ${SHAREDIR}/shorewall6-lite/version ]; then shorewall4)
PRODUCT=shorewall6-lite PRODUCT=shorewall
else ;;
fatal_error "No Shorewall firewall product is installed" shorewall-lite)
fi PRODUCT=shorewall-lite
;;
shorewall6-lite)
PRODUCT=shorewall6-lite
;;
*)
if [ -f ${g_basedir}/version ]; then
PRODUCT=shorewall
elif [ -f ${SHAREDIR}/shorewall-lite/version ]; then
PRODUCT=shorewall-lite
elif [ -f ${SHAREDIR}/shorewall6-lite/version ]; then
PRODUCT=shorewall6-lite
else
fatal_error "No Shorewall firewall product is installed"
fi
;;
esac
} }
# Not configured Error # Not configured Error