mirror of
https://gitlab.com/shorewall/code.git
synced 2024-11-22 07:33:43 +01:00
Move startup_error() to lib.cli, plus cosmetic changes
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
parent
eec8a4edaf
commit
4cf564e7c9
@ -155,15 +155,6 @@ verify_firewall_script() {
|
||||
fi
|
||||
}
|
||||
|
||||
#
|
||||
# Fatal error
|
||||
#
|
||||
startup_error() {
|
||||
echo " ERROR: $@" >&2
|
||||
kill $$
|
||||
exit 1
|
||||
}
|
||||
|
||||
#
|
||||
# Start Command Executor
|
||||
#
|
||||
|
@ -33,6 +33,15 @@ fatal_error() # $@ = Message
|
||||
exit 2
|
||||
}
|
||||
|
||||
#
|
||||
# Issue an error message and die
|
||||
#
|
||||
startup_error() {
|
||||
echo " ERROR: $@" >&2
|
||||
kill $$
|
||||
exit 1
|
||||
}
|
||||
|
||||
#
|
||||
# Display a chain if it exists
|
||||
#
|
||||
|
@ -331,15 +331,6 @@ get_config() {
|
||||
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
|
||||
#
|
||||
@ -1596,7 +1587,7 @@ compiler_command() {
|
||||
compile)
|
||||
get_config Yes
|
||||
shift
|
||||
compile_command $@1
|
||||
compile_command $@
|
||||
;;
|
||||
refresh)
|
||||
get_config Yes Yes
|
||||
|
@ -392,7 +392,7 @@ case "$COMMAND" in
|
||||
get_config
|
||||
[ -n "$g_debugging" ] && set -x
|
||||
#
|
||||
# Undocumented way to call functions in ${SHAREDIR}/functions directly
|
||||
# Undocumented way to call functions in the libraries directly
|
||||
#
|
||||
shift
|
||||
$@
|
||||
|
Loading…
Reference in New Issue
Block a user