Merge branch '5.1.1'

This commit is contained in:
Tom Eastep 2017-02-06 10:26:55 -08:00
commit d50fdea2a7
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10

View File

@ -4399,7 +4399,10 @@ shorewall_cli() {
finished=0 finished=0
while [ $finished -eq 0 ]; do while [ $finished -eq 0 ]; do
[ $# -eq 0 ] && usage 1 if [ $# -eq 0 ]; then
setup_product_environment 1
usage 1
fi
option=$1 option=$1
case $option in case $option in
-) -)
@ -4529,10 +4532,6 @@ shorewall_cli() {
esac esac
done done
if [ $# -eq 0 ]; then
usage 1
fi
setup_product_environment 1 setup_product_environment 1
[ -n "$g_lite" ] || . ${SHAREDIR}/shorewall/lib.cli-std [ -n "$g_lite" ] || . ${SHAREDIR}/shorewall/lib.cli-std