A little cleanup.

This commit is contained in:
JT Smith 2002-06-18 00:31:29 +00:00
parent 5c63593efc
commit 9d419d4921

View file

@ -35,14 +35,14 @@ if ($^O =~ /Win/i) {
$os = "Linuxish"; $os = "Linuxish";
} }
print "Operating System.........................".$os."\n"; print "Operating System ......................... ".$os."\n";
print "WebGUI Root..............................".$webguiRoot."\n"; print "WebGUI Root .............................. ".$webguiRoot."\n";
################################### ###################################
# Checking Perl # Checking Perl
################################### ###################################
print "Perl Interpreter........................."; print "Perl Interpreter ......................... ";
if ($] >= 5.006) { if ($] >= 5.006) {
print "OK\n"; print "OK\n";
} else { } else {
@ -51,12 +51,12 @@ if ($] >= 5.006) {
exit; exit;
} }
print "LWP module..............................."; print "LWP module ............................... ";
if (eval { require LWP }) { if (eval { require LWP }) {
print "OK\n"; print "OK\n";
} else { } else {
if ($< == 0 && $os eq "Linuxish") { if ($< == 0 && $os eq "Linuxish") {
print "Installing...\n"; print "Attempting to install...\n";
CPAN::Shell->install("LWP"); CPAN::Shell->install("LWP");
} else { } else {
print "Please install.\n"; print "Please install.\n";
@ -64,7 +64,7 @@ if (eval { require LWP }) {
} }
} }
print "HTTP::Request module....................."; print "HTTP::Request module ..................... ";
if (eval { require HTTP::Request }) { if (eval { require HTTP::Request }) {
print "OK\n"; print "OK\n";
} else { } else {
@ -72,7 +72,7 @@ if (eval { require HTTP::Request }) {
$prereq = 0; $prereq = 0;
} }
print "HTTP::Headers module....................."; print "HTTP::Headers module ..................... ";
if (eval { require HTTP::Headers }) { if (eval { require HTTP::Headers }) {
print "OK\n"; print "OK\n";
} else { } else {
@ -80,12 +80,12 @@ if (eval { require HTTP::Headers }) {
$prereq = 0; $prereq = 0;
} }
print "Digest::MD5 module......................."; print "Digest::MD5 module ....................... ";
if (eval { require Digest::MD5 }) { if (eval { require Digest::MD5 }) {
print "OK\n"; print "OK\n";
} else { } else {
if ($< == 0 && $os eq "Linuxish") { if ($< == 0 && $os eq "Linuxish") {
print "Installing...\n"; print "Attempting to install...\n";
CPAN::Shell->install("Digest::MD5"); CPAN::Shell->install("Digest::MD5");
} else { } else {
print "Please install.\n"; print "Please install.\n";
@ -95,13 +95,13 @@ if (eval { require Digest::MD5 }) {
my $dbi; my $dbi;
print "DBI module..............................."; print "DBI module ............................... ";
if (eval { require DBI }) { if (eval { require DBI }) {
print "OK\n"; print "OK\n";
$dbi = 1; $dbi = 1;
} else { } else {
if ($< == 0 && $os eq "Linuxish") { if ($< == 0 && $os eq "Linuxish") {
print "Installing...\n"; print "Attempting to install...\n";
CPAN::Shell->install("DBI"); CPAN::Shell->install("DBI");
eval {require DBI}; eval {require DBI};
$dbi = 1; $dbi = 1;
@ -112,7 +112,7 @@ if (eval { require DBI }) {
} }
} }
print "Avalable database drivers................"; print "Avalable database drivers ................ ";
if ($dbi) { if ($dbi) {
print join(", ",DBI->available_drivers); print join(", ",DBI->available_drivers);
} else { } else {
@ -121,12 +121,12 @@ if ($dbi) {
} }
print "\n"; print "\n";
print "HTML::Parser module......................"; print "HTML::Parser module ...................... ";
if (eval { require HTML::Parser }) { if (eval { require HTML::Parser }) {
print "OK\n"; print "OK\n";
} else { } else {
if ($< == 0 && $os eq "Linuxish") { if ($< == 0 && $os eq "Linuxish") {
print "Installing...\n"; print "Attempting to install...\n";
CPAN::Shell->install("HTML::Parser"); CPAN::Shell->install("HTML::Parser");
} else { } else {
print "Please install.\n"; print "Please install.\n";
@ -134,12 +134,12 @@ if (eval { require HTML::Parser }) {
} }
} }
print "Tie::IxHash module......................."; print "Tie::IxHash module ....................... ";
if (eval { require Tie::IxHash }) { if (eval { require Tie::IxHash }) {
print "OK\n"; print "OK\n";
} else { } else {
if ($< == 0 && $os eq "Linuxish") { if ($< == 0 && $os eq "Linuxish") {
print "Installing...\n"; print "Attempting to install...\n";
CPAN::Shell->install("Tie::IxHash"); CPAN::Shell->install("Tie::IxHash");
} else { } else {
print "Please install.\n"; print "Please install.\n";
@ -147,12 +147,12 @@ if (eval { require Tie::IxHash }) {
} }
} }
print "Tie::CPHash module......................."; print "Tie::CPHash module ....................... ";
if (eval { require Tie::CPHash }) { if (eval { require Tie::CPHash }) {
print "OK\n"; print "OK\n";
} else { } else {
if ($< == 0 && $os eq "Linuxish") { if ($< == 0 && $os eq "Linuxish") {
print "Installing...\n"; print "Attempting to install...\n";
CPAN::Shell->install("Tie::CPHash"); CPAN::Shell->install("Tie::CPHash");
} else { } else {
print "Please install.\n"; print "Please install.\n";
@ -160,12 +160,12 @@ if (eval { require Tie::CPHash }) {
} }
} }
print "Net::SMTP module........................."; print "Net::SMTP module ......................... ";
if (eval { require Net::SMTP }) { if (eval { require Net::SMTP }) {
print "OK\n"; print "OK\n";
} else { } else {
if ($< == 0 && $os eq "Linuxish") { if ($< == 0 && $os eq "Linuxish") {
print "Installing...\n"; print "Attempting to install...\n";
CPAN::Shell->install("Net::SMTP"); CPAN::Shell->install("Net::SMTP");
} else { } else {
print "Please install.\n"; print "Please install.\n";
@ -173,12 +173,12 @@ if (eval { require Net::SMTP }) {
} }
} }
print "Net::LDAP module........................."; print "Net::LDAP module ......................... ";
if (eval { require Net::LDAP }) { if (eval { require Net::LDAP }) {
print "OK\n"; print "OK\n";
} else { } else {
if ($< == 0 && $os eq "Linuxish") { if ($< == 0 && $os eq "Linuxish") {
print "Installing...\n"; print "Attempting to install...\n";
CPAN::Shell->install("Net::LDAP"); CPAN::Shell->install("Net::LDAP");
} else { } else {
print "Please install.\n"; print "Please install.\n";
@ -186,12 +186,12 @@ if (eval { require Net::LDAP }) {
} }
} }
print "Date::Calc module........................"; print "Date::Calc module ........................ ";
if (eval { require Date::Calc }) { if (eval { require Date::Calc }) {
print "OK\n"; print "OK\n";
} else { } else {
if ($< == 0 && $os eq "Linuxish") { if ($< == 0 && $os eq "Linuxish") {
print "Installing...\n"; print "Attempting to install...\n";
CPAN::Shell->install("Date::Calc"); CPAN::Shell->install("Date::Calc");
} else { } else {
print "Please install.\n"; print "Please install.\n";
@ -199,12 +199,12 @@ if (eval { require Date::Calc }) {
} }
} }
print "HTML::CalendarMonthSimple module........."; print "HTML::CalendarMonthSimple module ......... ";
if (eval { require HTML::CalendarMonthSimple }) { if (eval { require HTML::CalendarMonthSimple }) {
print "OK\n"; print "OK\n";
} else { } else {
if ($< == 0 && $os eq "Linuxish") { if ($< == 0 && $os eq "Linuxish") {
print "Installing...\n"; print "Attempting to install...\n";
CPAN::Shell->install("HTML::CalendarMonthSimple"); CPAN::Shell->install("HTML::CalendarMonthSimple");
} else { } else {
print "Please install.\n"; print "Please install.\n";
@ -212,24 +212,17 @@ if (eval { require HTML::CalendarMonthSimple }) {
} }
} }
print "Image::Magick module....................."; print "Image::Magick module (optional) .......... ";
if (eval { require Image::Magick }) { if (eval { require Image::Magick }) {
print "OK\n"; print "OK\n";
} else { } else {
print "Please install or thumbnailing will be disabled.\n"; print "Not installed. Thumbnailing will be disabled.\n";
}
print "Apache::DBI module.......................";
if (eval { require Apache::DBI }) {
print "OK\n";
} else {
print "Please install if you want to use the mod_perl preloader.\n";
} }
# this is here to insure they installed correctly. # this is here to insure they installed correctly.
if ($prereq) { if ($prereq) {
print "WebGUI modules..........................."; print "WebGUI modules ........................... ";
if (eval { require WebGUI } && eval { require WebGUI::SQL }) { if (eval { require WebGUI } && eval { require WebGUI::SQL }) {
print "OK\n"; print "OK\n";
} else { } else {
@ -237,7 +230,7 @@ if ($prereq) {
$prereq = 0; $prereq = 0;
} }
print "Data::Config module......................"; print "Data::Config module ...................... ";
if (eval { require Data::Config }) { if (eval { require Data::Config }) {
print "OK\n"; print "OK\n";
} else { } else {
@ -245,7 +238,7 @@ if ($prereq) {
$prereq = 0; $prereq = 0;
} }
print "HTML::TagFilter module..................."; print "HTML::TagFilter module ................... ";
if (eval { require HTML::TagFilter }) { if (eval { require HTML::TagFilter }) {
print "OK\n"; print "OK\n";
} else { } else {
@ -281,8 +274,8 @@ if ($error ne "") {
# Checking Config File # Checking Config File
################################### ###################################
print "Found config file........................".$file."\n"; print "\nFound config file ........................ ".$file."\n";
print "Verifying file..........................."; print "Verifying file ........................... ";
my ($config); my ($config);
$config = new Data::Config $dir.$file; $config = new Data::Config $dir.$file;
unless (defined $config) { unless (defined $config) {
@ -313,7 +306,7 @@ if ($error ne "") {
# Checking database # Checking database
################################### ###################################
print "Database connection......................"; print "Database connection ...................... ";
my ($dbh, $test); my ($dbh, $test);
unless (eval {$dbh = DBI->connect($config->param('dsn'),$config->param('dbuser'),$config->param('dbpass'))}) { unless (eval {$dbh = DBI->connect($config->param('dsn'),$config->param('dbuser'),$config->param('dbpass'))}) {
print "Can't connect with info provided. Skipping.\n"; print "Can't connect with info provided. Skipping.\n";
@ -333,7 +326,7 @@ if ($error ne "") {
# Checking Version # Checking Version
################################### ###################################
print "Latest version..........................."; print "\nLatest version ........................... ";
my ($header, $userAgent, $request, $response, $version, $referer); my ($header, $userAgent, $request, $response, $version, $referer);
$userAgent = new LWP::UserAgent; $userAgent = new LWP::UserAgent;
$userAgent->agent("WebGUI-Check/2.0"); $userAgent->agent("WebGUI-Check/2.0");
@ -349,13 +342,13 @@ chomp $version;
if ($response->is_error) { if ($response->is_error) {
print "Couldn't connect to Plain Black Software. Check your connection and try again.\n"; print "Couldn't connect to Plain Black Software. Check your connection and try again.\n";
} elsif ($version eq $WebGUI::VERSION) { } elsif ($version eq $WebGUI::VERSION) {
print "OK\n"; print $version." OK\n";
} else { } else {
print "You are using ".$WebGUI::VERSION." and ".$version." is available.\n"; print "You are using ".$WebGUI::VERSION." and ".$version." is available.\n";
} }
print "\nTesting complete!\n"; print "\nTesting complete!\n\n";