diff options
Diffstat (limited to 'checksetup.pl')
| -rwxr-xr-x | checksetup.pl | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/checksetup.pl b/checksetup.pl index d7ef811bd..7c30a6e9d 100755 --- a/checksetup.pl +++ b/checksetup.pl @@ -18,7 +18,7 @@ use warnings; use File::Basename; BEGIN { chdir dirname($0); } -use lib qw(. lib); +use lib qw(. lib local/lib/perl5); use Getopt::Long qw(:config bundling); use Pod::Usage; @@ -41,7 +41,7 @@ Bugzilla::Install::Util::no_checksetup_from_cgi() if $ENV{'SERVER_SOFTWARE'}; init_console(); my %switch; -GetOptions(\%switch, 'help|h|?', 'check-modules', 'cpanfile', +GetOptions(\%switch, 'help|h|?', 'no-templates|t', 'verbose|v|no-silent', 'make-admin=s', 'reset-password=s', 'version|V', 'no-permissions|p'); @@ -49,12 +49,6 @@ GetOptions(\%switch, 'help|h|?', 'check-modules', 'cpanfile', # Print the help message if that switch was selected. pod2usage({-verbose => 1, -exitval => 1}) if $switch{'help'}; -# Export cpanfile and exit -if ($switch{cpanfile}) { - export_cpanfile(); - exit; -} - # Read in the "answers" file if it exists, for running in # non-interactive mode. my $answers_file = $ARGV[0]; @@ -64,11 +58,7 @@ print(install_string('header', get_version_and_os()) . "\n") unless $silent; exit 0 if $switch{'version'}; # Check required --MODULES-- my $module_results = check_requirements(!$silent); -Bugzilla::Install::Requirements::print_module_instructions( - $module_results, !$silent); -exit 1 if !$module_results->{pass}; # Break out if checking the modules is all we have been asked to do. -exit 0 if $switch{'check-modules'}; ########################################################################### # Load Bugzilla Modules @@ -245,7 +235,7 @@ checksetup.pl - A do-it-all upgrade and installation script for Bugzilla. =head1 SYNOPSIS - ./checksetup.pl [--help|--check-modules|--version] + ./checksetup.pl [--help|--version] ./checksetup.pl [SCRIPT [--verbose]] [--no-templates|-t] [--make-admin=user@domain.com] [--reset-password=user@domain.com] @@ -266,16 +256,6 @@ the L</"RUNNING CHECKSETUP NON-INTERACTIVELY"> section. Display this help text -=item B<--cpanfile> - -Outputs a cpanfile in the document root listing the current and optional -modules with their respective versions. This file can be used by <cpanm> -and other utilities used to install Perl dependencies. - -=item B<--check-modules> - -Only check for correct module dependencies and quit afterward. - =item B<--make-admin>=username@domain.com Makes the specified user into a Bugzilla administrator. This is |