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

Make initial progress message obey VERBOSITY

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2013-07-02 14:23:27 -07:00
parent 00c5985458
commit 3e1ed30f4e
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Shorewall-core/lib.cli
View File

@ -3369,6 +3369,7 @@ shorewall_cli() {
g_haveconfig= g_haveconfig=
g_conditional= g_conditional=
g_file= g_file=
g_doing=
VERBOSE= VERBOSE=
VERBOSITY=1 VERBOSITY=1

18
Shorewall/lib.cli-std
View File

@ -373,6 +373,8 @@ compiler() {
# #
get_config Yes get_config Yes
progress_message3 "$g_doing..."
case $COMMAND in case $COMMAND in
*start|try|refresh) *start|try|refresh)
;; ;;
@ -471,7 +473,7 @@ start_command() {
rc=$? rc=$?
[ -n "$nolock" ] || mutex_off [ -n "$nolock" ] || mutex_off
else else
progress_message3 "Compiling..." g_doing="Compiling"
if compiler $g_debugging $nolock compile ${VARDIR}/.start; then if compiler $g_debugging $nolock compile ${VARDIR}/.start; then
run_postcompile ${VARDIR}/.start run_postcompile ${VARDIR}/.start
@ -687,7 +689,7 @@ compile_command() {
;; ;;
esac esac
[ "x$g_file" = x- ] || progress_message3 "Compiling..." [ "x$g_file" = x- ] || g_doing="Compiling"
compiler $g_debugging compile $g_file && run_postcompile $g_file compiler $g_debugging compile $g_file && run_postcompile $g_file
} }
@ -766,7 +768,7 @@ check_command() {
;; ;;
esac esac
progress_message3 "Checking..." g_doing="Checking"
compiler $g_debugging $nolock check compiler $g_debugging $nolock check
} }
@ -858,7 +860,7 @@ update_command() {
;; ;;
esac esac
progress_message3 "Updating..." g_doing="Updating..."
compiler $g_debugging $nolock check compiler $g_debugging $nolock check
} }
@ -953,7 +955,7 @@ restart_command() {
fi fi
if [ -z "$g_fast" ]; then if [ -z "$g_fast" ]; then
progress_message3 "Compiling..." g_doing="Compiling"
if compiler $g_debugging $nolock compile ${VARDIR}/.restart; then if compiler $g_debugging $nolock compile ${VARDIR}/.restart; then
run_postcompile ${VARDIR}/.restart run_postcompile ${VARDIR}/.restart
@ -1045,7 +1047,7 @@ refresh_command() {
[ -n "$STARTUP_ENABLED" ] || fatal_error "Startup is disabled" [ -n "$STARTUP_ENABLED" ] || fatal_error "Startup is disabled"
progress_message3 "Compiling..." g_doing="Compiling"
if compiler $g_debugging $nolock compile ${VARDIR}/.refresh; then if compiler $g_debugging $nolock compile ${VARDIR}/.refresh; then
run_postcompile ${VARDIR}/.refresh run_postcompile ${VARDIR}/.refresh
@ -1156,7 +1158,7 @@ safe_commands() {
command="restart" command="restart"
fi fi
progress_message3 "Compiling..." g_doing="Compiling"
if ! compiler $g_debugging nolock compile ${VARDIR}/.$command; then if ! compiler $g_debugging nolock compile ${VARDIR}/.$command; then
status=$? status=$?
@ -1289,7 +1291,7 @@ try_command() {
command="restart" command="restart"
fi fi
progress_message3 "Compiling..." g_doing="Compiling"
if ! compiler $g_debugging $nolock compile ${VARDIR}/.$command; then if ! compiler $g_debugging $nolock compile ${VARDIR}/.$command; then
status=$? status=$?