mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-24 03:31:24 +02:00
Include Compiler version in the compiler progress commands
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
parent
3d325431ff
commit
bc8156b503
@ -463,7 +463,17 @@ compiler() {
|
|||||||
PERL=/usr/bin/perl
|
PERL=/usr/bin/perl
|
||||||
fi
|
fi
|
||||||
|
|
||||||
[ -n "$g_doing" ] && progress_message3 "$g_doing..."
|
case "$g_doing" in
|
||||||
|
Compiling|Checking)
|
||||||
|
progress_message3 "$g_doing using $g_product $SHOREWALL_VERSION..."
|
||||||
|
;;
|
||||||
|
Updating)
|
||||||
|
progress_message3 "Updating $g_product configuration to $SHOREWALL_VERSION..."
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
[ -n "$g_doing" ] && progress_message3 "$g_doing using $g_product $SHOREWALL_VERSION..."
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
if [ ${PERLLIBDIR} = ${LIBEXECDIR}/shorewall ]; then
|
if [ ${PERLLIBDIR} = ${LIBEXECDIR}/shorewall ]; then
|
||||||
$PERL $debugflags $pc $options $@
|
$PERL $debugflags $pc $options $@
|
||||||
@ -473,7 +483,7 @@ compiler() {
|
|||||||
|
|
||||||
status=$?
|
status=$?
|
||||||
|
|
||||||
if [ $status -eq 0 -a $COMMAND != check ]; then
|
if [ $status -eq 0 -a $COMMAND != check -a $COMMAND != update ]; then
|
||||||
g_compiled="$g_file"
|
g_compiled="$g_file"
|
||||||
run_postcompile "$g_compiled"
|
run_postcompile "$g_compiled"
|
||||||
return
|
return
|
||||||
@ -915,7 +925,7 @@ update_command() {
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
g_doing="Updating..."
|
g_doing="Updating"
|
||||||
|
|
||||||
compiler $g_debugging $nolock check
|
compiler $g_debugging $nolock check
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user