extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-22 07:33:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplify fix for -q

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2013-07-03 08:16:27 -07:00
parent 9dd53cd2fd
commit 299e674324
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall-core/lib.cli
View File

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

14
Shorewall/lib.cli-std
View File

@ -373,7 +373,7 @@ compiler() {
# #
get_config Yes get_config Yes
progress_message3 "$g_doing..." [ -n "$g_doing" ] && progress_message3 "$g_doing..."
case $COMMAND in case $COMMAND in
*start|try|refresh) *start|try|refresh)
@ -473,8 +473,6 @@ start_command() {
rc=$? rc=$?
[ -n "$nolock" ] || mutex_off [ -n "$nolock" ] || mutex_off
else else
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
[ -n "$nolock" ] || mutex_on [ -n "$nolock" ] || mutex_on
@ -689,7 +687,7 @@ compile_command() {
;; ;;
esac esac
[ "x$g_file" = x- ] || g_doing="Compiling" [ "x$g_file" = x- ] && g_doing=''
compiler $g_debugging compile $g_file && run_postcompile $g_file compiler $g_debugging compile $g_file && run_postcompile $g_file
} }
@ -955,8 +953,6 @@ restart_command() {
fi fi
if [ -z "$g_fast" ]; then if [ -z "$g_fast" ]; then
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
[ -n "$nolock" ] || mutex_on [ -n "$nolock" ] || mutex_on
@ -1047,8 +1043,6 @@ refresh_command() {
[ -n "$STARTUP_ENABLED" ] || fatal_error "Startup is disabled" [ -n "$STARTUP_ENABLED" ] || fatal_error "Startup is disabled"
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
[ -n "$nolock" ] || mutex_on [ -n "$nolock" ] || mutex_on
@ -1158,8 +1152,6 @@ safe_commands() {
command="restart" command="restart"
fi fi
g_doing="Compiling"
if ! compiler $g_debugging nolock compile ${VARDIR}/.$command; then if ! compiler $g_debugging nolock compile ${VARDIR}/.$command; then
status=$? status=$?
exit $status exit $status
@ -1291,8 +1283,6 @@ try_command() {
command="restart" command="restart"
fi fi
g_doing="Compiling"
if ! compiler $g_debugging $nolock compile ${VARDIR}/.$command; then if ! compiler $g_debugging $nolock compile ${VARDIR}/.$command; then
status=$? status=$?
exit $status exit $status