[Koha-cvs] CVS: koha koha.upgrade,1.1.2.16,1.1.2.17
Steve Tonnesen
tonnesen at users.sourceforge.net
Sat Jul 27 07:38:55 CEST 2002
Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv26178
Modified Files:
Tag: rel-1-2
koha.upgrade
Log Message:
Fixed bugs with variable scope after switching some functions to Install.pm
Index: koha.upgrade
===================================================================
RCS file: /cvsroot/koha/koha/koha.upgrade,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -C2 -r1.1.2.16 -r1.1.2.17
*** koha.upgrade 26 Jul 2002 18:23:54 -0000 1.1.2.16
--- koha.upgrade 27 Jul 2002 05:38:53 -0000 1.1.2.17
***************
*** 3,6 ****
--- 3,7 ----
#use diagnostics;
use strict; # please develop with the strict pragma
+ use Install;
***************
*** 17,21 ****
! ($kohaversion) || ($kohaversion='unknown version');
my $newversion=`cat koha.version`;
chomp $newversion;
--- 18,22 ----
! ($::kohaversion) || ($::kohaversion='unknown version');
my $newversion=`cat koha.version`;
chomp $newversion;
***************
*** 30,34 ****
================
! You are attempting to upgrade from Koha $kohaversion to $newversion.
We recommend that you do a complete backup of all your files before upgrading.
--- 31,35 ----
================
! You are attempting to upgrade from Koha $::kohaversion to $newversion.
We recommend that you do a complete backup of all your files before upgrading.
***************
*** 107,111 ****
my $date= sprintf "%4d-%02d-%02d_%02d:%02d:%02d", $year, $month, $day,$hr,$min,$sec;
! open (MD, "$mysqldir/bin/mysqldump --user=$user --password=$pass --host=$hostname $database|");
(open BF, ">$backupdir/Koha.backup_$date") || (die "Error opening up backup file $backupdir/Koha.backup_$date: $!\n");
--- 108,112 ----
my $date= sprintf "%4d-%02d-%02d_%02d:%02d:%02d", $year, $month, $day,$hr,$min,$sec;
! open (MD, "$mysqldir/bin/mysqldump --user=$::user --password=$::pass --host=$::hostname $::database|");
(open BF, ">$backupdir/Koha.backup_$date") || (die "Error opening up backup file $backupdir/Koha.backup_$date: $!\n");
***************
*** 162,172 ****
! if ($opacdir && $intranetdir) {
print qq|
I believe that your old files are located in:
! OPAC: $opacdir
! INTRANET: $intranetdir
--- 163,173 ----
! if ($::opacdir && $::intranetdir) {
print qq|
I believe that your old files are located in:
! OPAC: $::opacdir
! INTRANET: $::intranetdir
***************
*** 177,182 ****
if ($answer =~/n/i) {
! $intranetdir='';
! $opacdir='';
} else {
print "Great! continuing upgrade... \n";
--- 178,183 ----
if ($answer =~/n/i) {
! $::intranetdir='';
! $::opacdir='';
} else {
print "Great! continuing upgrade... \n";
***************
*** 185,192 ****
! if (!$opacdir || !$intranetdir) {
! $intranetdir='';
! $opacdir='';
! while (!$intranetdir) {
print "Please specify the location of your INTRANET files: ";
--- 186,193 ----
! if (!$::opacdir || !$::intranetdir) {
! $::intranetdir='';
! $::opacdir='';
! while (!$::intranetdir) {
print "Please specify the location of your INTRANET files: ";
***************
*** 195,206 ****
if ($answer) {
! $intranetdir=$answer;
}
! if (! -e "$intranetdir/htdocs") {
print "\nCouldn't find the htdocs directory here. That doesn't look right.\nPlease enter another location.\n\n";
! $intranetdir='';
}
}
! while (!$opacdir) {
print "Please specify the location of your OPAC files: ";
--- 196,207 ----
if ($answer) {
! $::intranetdir=$answer;
}
! if (! -e "$::intranetdir/htdocs") {
print "\nCouldn't find the htdocs directory here. That doesn't look right.\nPlease enter another location.\n\n";
! $::intranetdir='';
}
}
! while (!$::opacdir) {
print "Please specify the location of your OPAC files: ";
***************
*** 209,217 ****
if ($answer) {
! $opacdir=$answer;
}
! if (! -e "$opacdir/htdocs") {
print "\nCouldn't find the htdocs directory here. That doesn't look right.\nPlease enter another location.\n\n";
! $opacdir='';
}
}
--- 210,218 ----
if ($answer) {
! $::opacdir=$answer;
}
! if (! -e "$::opacdir/htdocs") {
print "\nCouldn't find the htdocs directory here. That doesn't look right.\nPlease enter another location.\n\n";
! $::opacdir='';
}
}
***************
*** 227,258 ****
mkdir "$backupdir/kohafiles-$date/opac", 0770;
! my $result=system("cp -R $intranetdir/* $backupdir/kohafiles-$date/intranet/");
if ($result) {
! print "Error encounted when copying $intranetdir to $backupdir/kohafiles-$date/intranet/\n";
exit;
} else {
! system("rm -rf $intranetdir/*");
}
! $result=system("cp -R $opacdir/* $backupdir/kohafiles-$date/opac/");
if ($result) {
! print "Error encounted when copying $opacdir to $backupdir/kohafiles-$date/opac/\n";
exit;
} else {
! system("rm -rf $opacdir/*");
}
! print "Creating $intranetdir/htdocs...\n";
! mkdir ("$intranetdir/htdocs", oct(750));
! print "Creating $intranetdir/cgi-bin...\n";
! mkdir ("$intranetdir/cgi-bin", oct(750));
! print "Creating $intranetdir/modules...\n";
! mkdir ("$intranetdir/modules", oct(750));
! print "Creating $intranetdir/scripts...\n";
! mkdir ("$intranetdir/scripts", oct(750));
! chmod (oct(770), "$opacdir");
! print "Creating $opacdir/htdocs...\n";
! mkdir ("$opacdir/htdocs", oct(750));
! print "Creating $opacdir/cgi-bin...\n";
! mkdir ("$opacdir/cgi-bin", oct(750));
my $httpduser;
--- 228,259 ----
mkdir "$backupdir/kohafiles-$date/opac", 0770;
! my $result=system("cp -R $::intranetdir/* $backupdir/kohafiles-$date/intranet/");
if ($result) {
! print "Error encounted when copying $::intranetdir to $backupdir/kohafiles-$date/intranet/\n";
exit;
} else {
! system("rm -rf $::intranetdir/*");
}
! $result=system("cp -R $::opacdir/* $backupdir/kohafiles-$date/opac/");
if ($result) {
! print "Error encounted when copying $::opacdir to $backupdir/kohafiles-$date/opac/\n";
exit;
} else {
! system("rm -rf $::opacdir/*");
}
! print "Creating $::intranetdir/htdocs...\n";
! mkdir ("$::intranetdir/htdocs", oct(750));
! print "Creating $::intranetdir/cgi-bin...\n";
! mkdir ("$::intranetdir/cgi-bin", oct(750));
! print "Creating $::intranetdir/modules...\n";
! mkdir ("$::intranetdir/modules", oct(750));
! print "Creating $::intranetdir/scripts...\n";
! mkdir ("$::intranetdir/scripts", oct(750));
! chmod (oct(770), "$::opacdir");
! print "Creating $::opacdir/htdocs...\n";
! mkdir ("$::opacdir/htdocs", oct(750));
! print "Creating $::opacdir/cgi-bin...\n";
! mkdir ("$::opacdir/cgi-bin", oct(750));
my $httpduser;
***************
*** 299,333 ****
print "\n\nINSTALLING KOHA...\n";
print "\n\n==================\n";
! print "Copying internet-html files to $intranetdir/htdocs...\n";
! system("cp -R intranet-html/* $intranetdir/htdocs/");
! print "Copying intranet-cgi files to $intranetdir/cgi-bin...\n";
! system("cp -R intranet-cgi/* $intranetdir/cgi-bin/");
! print "Copying script files to $intranetdir/scripts...\n";
! system("cp -R scripts/* $intranetdir/scripts/");
! print "Copying module files to $intranetdir/modules...\n";
! system("cp -R modules/* $intranetdir/modules/");
! print "Copying opac-html files to $opacdir/htdocs...\n";
! system("cp -R opac-html/* $opacdir/htdocs/");
! print "Copying opac-cgi files to $opacdir/cgi-bin...\n";
! system("cp -R opac-cgi/* $opacdir/cgi-bin/");
system("touch $::opacdir/cgi-bin/opac");
! system("chown -R root.$httpduser $opacdir");
! system("chown -R root.$httpduser $intranetdir");
! unless ($kohalogdir && -e $kohalogdir) {
! $kohalogdir='/var/log/koha';
! print "\n\nDirectory for logging by Z39.50 daemon [$kohalogdir]: ";
chomp($input = <STDIN>);
if ($input) {
! $kohalogdir=$input;
}
}
! unless (-e "$kohalogdir") {
! my $result = mkdir 0770, "$kohalogdir";
if ($result==0) {
! my @dirs = split(m#/#, $kohalogdir);
my $checkdir='';
foreach (@dirs) {
--- 300,334 ----
print "\n\nINSTALLING KOHA...\n";
print "\n\n==================\n";
! print "Copying internet-html files to $::intranetdir/htdocs...\n";
! system("cp -R intranet-html/* $::intranetdir/htdocs/");
! print "Copying intranet-cgi files to $::intranetdir/cgi-bin...\n";
! system("cp -R intranet-cgi/* $::intranetdir/cgi-bin/");
! print "Copying script files to $::intranetdir/scripts...\n";
! system("cp -R scripts/* $::intranetdir/scripts/");
! print "Copying module files to $::intranetdir/modules...\n";
! system("cp -R modules/* $::intranetdir/modules/");
! print "Copying opac-html files to $::opacdir/htdocs...\n";
! system("cp -R opac-html/* $::opacdir/htdocs/");
! print "Copying opac-cgi files to $::opacdir/cgi-bin...\n";
! system("cp -R opac-cgi/* $::opacdir/cgi-bin/");
system("touch $::opacdir/cgi-bin/opac");
! system("chown -R root.$httpduser $::opacdir");
! system("chown -R root.$httpduser $::intranetdir");
! unless ($::kohalogdir && -e $::kohalogdir) {
! $::kohalogdir='/var/log/koha';
! print "\n\nDirectory for logging by Z39.50 daemon [$::kohalogdir]: ";
chomp($input = <STDIN>);
if ($input) {
! $::kohalogdir=$input;
}
}
! unless (-e "$::kohalogdir") {
! my $result = mkdir 0770, "$::kohalogdir";
if ($result==0) {
! my @dirs = split(m#/#, $::kohalogdir);
my $checkdir='';
foreach (@dirs) {
***************
*** 340,348 ****
}
! chmod 0750, "$intranetdir/scripts/z3950daemon/z3950-daemon-launch.sh";
! chmod 0750, "$intranetdir/scripts/z3950daemon/z3950-daemon-shell.sh";
! chmod 0750, "$intranetdir/scripts/z3950daemon/processz3950queue";
! chown(0, (getpwnam($httpduser)) [3], "$intranetdir/scripts/z3950daemon/z3950-daemon-shell.sh") or warn "can't chown $intranetdir/scripts/z3950daemon/z3950-daemon-shell.sh: $!";
! chown(0, (getpwnam($httpduser)) [3], "$intranetdir/scripts/z3950daemon/processz3950queue") or warn "can't chown $intranetdir/scripts/z3950daemon/processz3950queue: $!";
--- 341,349 ----
}
! chmod 0750, "$::intranetdir/scripts/z3950daemon/z3950-daemon-launch.sh";
! chmod 0750, "$::intranetdir/scripts/z3950daemon/z3950-daemon-shell.sh";
! chmod 0750, "$::intranetdir/scripts/z3950daemon/processz3950queue";
! chown(0, (getpwnam($httpduser)) [3], "$::intranetdir/scripts/z3950daemon/z3950-daemon-shell.sh") or warn "can't chown $::intranetdir/scripts/z3950daemon/z3950-daemon-shell.sh: $!";
! chown(0, (getpwnam($httpduser)) [3], "$::intranetdir/scripts/z3950daemon/processz3950queue") or warn "can't chown $::intranetdir/scripts/z3950daemon/processz3950queue: $!";
***************
*** 352,356 ****
while (<KC>) {
if (/^\s*includes\s*=/) {
! $kccontents.="includes=$intranetdir/htdocs/includes\n";
$kc->{'includes'}=1;
} elsif (/^\s*httpduser\s*=/) {
--- 353,357 ----
while (<KC>) {
if (/^\s*includes\s*=/) {
! $kccontents.="includes=$::intranetdir/htdocs/includes\n";
$kc->{'includes'}=1;
} elsif (/^\s*httpduser\s*=/) {
***************
*** 361,371 ****
$kc->{'kohaversion'}=1;
} elsif (/^\s*kohalogdir\s*=/) {
! $kccontents.="kohalogdir=$kohalogdir\n";
$kc->{'kohalogdir'}=1;
} elsif (/^\s*intranetdir\s*=/) {
! $kccontents.="intranetdir=$intranetdir\n";
$kc->{'intranetdir'}=1;
} elsif (/^\s*opacdir\s*=/) {
! $kccontents.="opacdir=$opacdir\n";
$kc->{'opacdir'}=1;
} else {
--- 362,372 ----
$kc->{'kohaversion'}=1;
} elsif (/^\s*kohalogdir\s*=/) {
! $kccontents.="kohalogdir=$::kohalogdir\n";
$kc->{'kohalogdir'}=1;
} elsif (/^\s*intranetdir\s*=/) {
! $kccontents.="intranetdir=$::intranetdir\n";
$kc->{'intranetdir'}=1;
} elsif (/^\s*opacdir\s*=/) {
! $kccontents.="opacdir=$::opacdir\n";
$kc->{'opacdir'}=1;
} else {
***************
*** 378,382 ****
}
unless (defined($kc->{'includes'})) {
! $kccontents.="includes=$intranetdir/htdocs/includes\n";
}
unless (defined($kc->{'httpduser'})) {
--- 379,383 ----
}
unless (defined($kc->{'includes'})) {
! $kccontents.="includes=$::intranetdir/htdocs/includes\n";
}
unless (defined($kc->{'httpduser'})) {
***************
*** 384,394 ****
}
unless (defined($kc->{'intranetdir'})) {
! $kccontents.="intranetdir=$intranetdir\n";
}
unless (defined($kc->{'opacdir'})) {
! $kccontents.="opacdir=$opacdir\n";
}
unless (defined($kc->{'kohalogdir'})) {
! $kccontents.="kohalogdir=$kohalogdir\n";
}
--- 385,395 ----
}
unless (defined($kc->{'intranetdir'})) {
! $kccontents.="intranetdir=$::intranetdir\n";
}
unless (defined($kc->{'opacdir'})) {
! $kccontents.="opacdir=$::opacdir\n";
}
unless (defined($kc->{'kohalogdir'})) {
! $kccontents.="kohalogdir=$::kohalogdir\n";
}
***************
*** 406,410 ****
==================
|;
! system ("perl -I $intranetdir/modules scripts/updater/updatedatabase");
--- 407,411 ----
==================
|;
! system ("perl -I $::intranetdir/modules scripts/updater/updatedatabase");
***************
*** 439,450 ****
In your INTRANET VirtualHost section you should have:
! DocumentRoot $intranetdir/htdocs
! ScriptAlias /cgi-bin/koha/ $intranetdir/cgi-bin/
! SetEnv PERL5LIB $intranetdir/modules
In the OPAC VirtualHost section you should have:
! DocumentRoot $opacdir/htdocs
! ScriptAlias /cgi-bin/koha/ $opacdir/cgi-bin/
! SetEnv PERL5LIB $intranetdir/modules
You may also need to uncomment a "LoadModules env_module ... " line and restart
--- 440,451 ----
In your INTRANET VirtualHost section you should have:
! DocumentRoot $::intranetdir/htdocs
! ScriptAlias /cgi-bin/koha/ $::intranetdir/cgi-bin/
! SetEnv PERL5LIB $::intranetdir/modules
In the OPAC VirtualHost section you should have:
! DocumentRoot $::opacdir/htdocs
! ScriptAlias /cgi-bin/koha/ $::opacdir/cgi-bin/
! SetEnv PERL5LIB $::intranetdir/modules
You may also need to uncomment a "LoadModules env_module ... " line and restart
More information about the Koha-cvs
mailing list