summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjocuri%softhome.net <>2005-01-17 06:42:56 +0100
committerjocuri%softhome.net <>2005-01-17 06:42:56 +0100
commit9df2627d0df79320094d571794f700cef073ea8a (patch)
tree30cbe913e8e98792d660501f3693203666ceeff6
parent0ffaf78a472cfd6dd5a4b1da80b5dd50f2611647 (diff)
downloadbugzilla-9df2627d0df79320094d571794f700cef073ea8a.tar.gz
bugzilla-9df2627d0df79320094d571794f700cef073ea8a.tar.xz
Patch for bug 275752: Make checksetup.pl to implicit chdir to the bugzilla directory; patch by Byron Jones (glob) <bugzilla@glob.com.au>, r=wurblzap, a=justdave.
-rwxr-xr-xchecksetup.pl19
1 files changed, 10 insertions, 9 deletions
diff --git a/checksetup.pl b/checksetup.pl
index 932870dd2..9615beb73 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -115,6 +115,16 @@
#
use strict;
+
+BEGIN {
+ if ($^O =~ /MSWin32/i) {
+ require 5.008001; # for CGI 2.93 or higher
+ }
+ require 5.006;
+ use File::Basename;
+ chdir dirname($0);
+}
+
use lib ".";
use vars qw( $db_name %answer );
@@ -178,15 +188,6 @@ if ($ARGV[0] && ($ARGV[0] !~ /^--/)) {
#
print "\nChecking perl modules ...\n" unless $silent;
-if ($^O =~ /MSWin32/i) {
- unless ($] >= 5.008001) {
- die "Sorry, you need at least ActiveState Perl build 5.8.1\n";
- # for CGI 2.93 or higher
- }
-}
-unless ($] >= 5.006) {
- die "Sorry, you need at least Perl 5.6\n";
-}
# vers_cmp is adapted from Sort::Versions 1.3 1996/07/11 13:37:00 kjahds,
# which is not included with Perl by default, hence the need to copy it here.