Move startup_error() to lib.cli, plus cosmetic changes

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-12-08 22:00:48 -08:00
parent eec8a4edaf
commit 4cf564e7c9
4 changed files with 11 additions and 20 deletions

View File

@ -155,15 +155,6 @@ verify_firewall_script() {
fi fi
} }
#
# Fatal error
#
startup_error() {
echo " ERROR: $@" >&2
kill $$
exit 1
}
# #
# Start Command Executor # Start Command Executor
# #

View File

@ -33,6 +33,15 @@ fatal_error() # $@ = Message
exit 2 exit 2
} }
#
# Issue an error message and die
#
startup_error() {
echo " ERROR: $@" >&2
kill $$
exit 1
}
# #
# Display a chain if it exists # Display a chain if it exists
# #

View File

@ -331,15 +331,6 @@ get_config() {
esac esac
} }
#
# Issue an error message and die
#
startup_error() {
echo " ERROR: $@" >&2
kill $$
exit 1
}
# #
# Determine if there are config files newer than the passed object # Determine if there are config files newer than the passed object
# #
@ -1596,7 +1587,7 @@ compiler_command() {
compile) compile)
get_config Yes get_config Yes
shift shift
compile_command $@1 compile_command $@
;; ;;
refresh) refresh)
get_config Yes Yes get_config Yes Yes

View File

@ -392,7 +392,7 @@ case "$COMMAND" in
get_config get_config
[ -n "$g_debugging" ] && set -x [ -n "$g_debugging" ] && set -x
# #
# Undocumented way to call functions in ${SHAREDIR}/functions directly # Undocumented way to call functions in the libraries directly
# #
shift shift
$@ $@