diff options
-rw-r--r-- | Bugzilla/Install/Localconfig.pm | 9 | ||||
-rw-r--r-- | template/en/default/setup/strings.txt.pl | 14 |
2 files changed, 14 insertions, 9 deletions
diff --git a/Bugzilla/Install/Localconfig.pm b/Bugzilla/Install/Localconfig.pm index 2f1a8d527..97dc17d2a 100644 --- a/Bugzilla/Install/Localconfig.pm +++ b/Bugzilla/Install/Localconfig.pm @@ -32,11 +32,12 @@ use strict; use Bugzilla::Constants; use Bugzilla::Install::Util qw(bin_loc install_string); -use Bugzilla::Util qw(generate_random_password); +use Bugzilla::Util qw(generate_random_password wrap_hard); use Data::Dumper; use File::Basename qw(dirname); use Safe; +use Term::ANSIColor; use base qw(Exporter); @@ -273,8 +274,10 @@ sub update_localconfig { if (@new_vars) { my $newstuff = join(', ', @new_vars); - print "\n", install_string('lc_new_vars', - { localconfig => $filename, new_vars => $newstuff }), "\n"; + print "\n"; + print colored(install_string('lc_new_vars', { localconfig => $filename, + new_vars => wrap_hard($newstuff, 70) }), + COLOR_ERROR), "\n"; exit; } diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl index b1dd7fcec..6c9fd3747 100644 --- a/template/en/default/setup/strings.txt.pl +++ b/template/en/default/setup/strings.txt.pl @@ -60,7 +60,7 @@ EOT commands_optional => 'COMMANDS TO INSTALL OPTIONAL MODULES:', commands_required => <<EOT, COMMANDS TO INSTALL REQUIRED MODULES (You *must* run all these commands -and then re-run this script): +and then re-run checksetup.pl): EOT continue_without_answers => <<'END', Re-run checksetup.pl in interactive mode (without an 'answers' file) @@ -140,12 +140,14 @@ END ERROR: Using install-module.pl requires that you install "make". END lc_new_vars => <<'END', -This version of Bugzilla contains some variables that you may want to -change and adapt to your local settings. Please edit the file -##localconfig## and then rerun checksetup.pl. +This version of Bugzilla contains some variables that you may want to +change and adapt to your local settings. The following variables are +new to ##localconfig## since you last ran checksetup.pl: -The following variables are new to ##localconfig## since you last ran -checksetup.pl: ##new_vars## +##new_vars## + +Please edit the file ##localconfig## and then re-run checksetup.pl +to complete your installation. END lc_old_vars => <<'END', The following variables are no longer used in ##localconfig##, and |