diff options
| -rw-r--r-- | Bugzilla/Constants.pm | 2 | ||||
| -rw-r--r-- | Bugzilla/Install/Util.pm | 6 | ||||
| -rwxr-xr-x | checksetup.pl | 11 | ||||
| -rw-r--r-- | template/en/default/global/messages.html.tmpl | 3 |
4 files changed, 20 insertions, 2 deletions
diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm index 72f4d4512..06bdaade0 100644 --- a/Bugzilla/Constants.pm +++ b/Bugzilla/Constants.pm @@ -149,6 +149,7 @@ use Memoize; ERROR_MODE_TEST COLOR_ERROR + COLOR_SUCCESS INSTALLATION_MODE_INTERACTIVE INSTALLATION_MODE_NON_INTERACTIVE @@ -470,6 +471,7 @@ use constant ERROR_MODE_TEST => 4; # The ANSI colors of messages that command-line scripts use use constant COLOR_ERROR => 'red'; +use constant COLOR_SUCCESS => 'green'; # The various modes that checksetup.pl can run in. use constant INSTALLATION_MODE_INTERACTIVE => 0; diff --git a/Bugzilla/Install/Util.pm b/Bugzilla/Install/Util.pm index 41f608abf..d65d2f592 100644 --- a/Bugzilla/Install/Util.pm +++ b/Bugzilla/Install/Util.pm @@ -47,6 +47,7 @@ our @EXPORT_OK = qw( indicate_progress install_string include_languages + success template_include_path vers_cmp init_console @@ -627,6 +628,11 @@ sub _console_die { die colored("$message", COLOR_ERROR) . "\n"; } +sub success { + my ($message) = @_; + print colored($message, COLOR_SUCCESS), "\n"; +} + sub prevent_windows_dialog_boxes { # This code comes from http://bugs.activestate.com/show_bug.cgi?id=82183 # and prevents Perl modules from popping up dialog boxes, particularly diff --git a/checksetup.pl b/checksetup.pl index 0e89447fe..b6b4fc19c 100755 --- a/checksetup.pl +++ b/checksetup.pl @@ -53,7 +53,8 @@ BEGIN { chdir dirname($0); } use lib qw(. lib); use Bugzilla::Constants; use Bugzilla::Install::Requirements; -use Bugzilla::Install::Util qw(install_string get_version_and_os init_console); +use Bugzilla::Install::Util qw(install_string get_version_and_os + init_console success); ###################################################################### # Live Code @@ -98,6 +99,9 @@ exit if $switch{'check-modules'}; require Bugzilla; require Bugzilla::User; +require Bugzilla::Util; +import Bugzilla::Util qw(get_text); + require Bugzilla::Config; import Bugzilla::Config qw(:admin); @@ -232,9 +236,12 @@ Bugzilla::Hook::process('install_before_final_checks', { silent => $silent }); # Check if the default parameter for urlbase is still set, and if so, give # notification that they should go and visit editparams.cgi if (Bugzilla->params->{'urlbase'} eq '') { - print "\n" . Bugzilla::Install::get_text('install_urlbase_default') . "\n" + print "\n" . get_text('install_urlbase_default') . "\n" unless $silent; } +if (!$silent) { + success(get_text('install_success')); +} __END__ diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl index 8747c56bf..5ffec4081 100644 --- a/template/en/default/global/messages.html.tmpl +++ b/template/en/default/global/messages.html.tmpl @@ -683,6 +683,9 @@ [% ELSIF message_tag == "install_setting_setup" %] Setting up user preferences... + [% ELSIF message_tag == "install_success" %] + checksetup.pl complete. + [% ELSIF message_tag == "install_table_drop" %] Dropping the '[% name FILTER html %]' table... |