[Koha-cvs] CVS: koha/misc koha.upgrade,1.10,1.11 Install.pm,1.61,1.62

[MJ Ray]

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1:/tmp/cvs-serv26977

Modified Files:
        koha.upgrade Install.pm 
Log Message:
Basic fixes to make the installer and upgrader run

Index: koha.upgrade
===================================================================
RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** koha.upgrade        27 Oct 2003 17:13:06 -0000      1.10
--- koha.upgrade        31 Oct 2003 17:34:25 -0000      1.11
***************
*** 23,30 ****
  
  #FIXME: need kohaversion number
! 
showmessage(getmessage('WelcomeToUpgrader',[$::kohaversion,$::newversion]),'yn');
  
  unless ($answer =~/y/i) {
!       showmessage(getmessage('AbortingInstall'),'PressEnter');
        exit;
  } else {
--- 23,30 ----
  
  #FIXME: need kohaversion number
! my $answer = 
showmessage(getmessage('WelcomeToUpgrader',[$::kohaversion,$::newversion]),'yn');
  
  unless ($answer =~/y/i) {
!       showmessage(getmessage('AbortingInstall'),'none');
        exit;
  } else {
***************
*** 41,45 ****
  finalizeconfigfile();
  
! showmessage(getmessage('UpgradeCompleted'),'PressEnter');
  
  my $reply=showmessage('Would you like to complete a survey about your 
library?', 'yn', 'y');
--- 41,45 ----
  finalizeconfigfile();
  
! 
showmessage(getmessage('UpgradeCompleted',['FIXME','FIXME','FIXME','FIXME','FIXME','FIXME']),'PressEnter');
  
  my $reply=showmessage('Would you like to complete a survey about your 
library?', 'yn', 'y');

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -r1.61 -r1.62
*** Install.pm  27 Oct 2003 17:39:41 -0000      1.61
--- Install.pm  31 Oct 2003 17:34:26 -0000      1.62
***************
*** 60,63 ****
--- 60,64 ----
                &showmessage
                &releasecandidatewarning
+               &setkohaversion
                &getinstallationdirectories
                &getdatabaseinfo
***************
*** 271,275 ****
  Press <ENTER> to exit the installer: |;
  
! $messages->{'UpgradeCompleted'}->{en} = heading('UPGRDE COMPLETE') . qq|
  Congratulations ... your Koha upgrade is finished!
  
--- 272,276 ----
  Press <ENTER> to exit the installer: |;
  
! $messages->{'UpgradeCompleted'}->{en} = heading('UPGRADE COMPLETE') . qq|
  Congratulations ... your Koha upgrade is finished!
  
***************
*** 279,290 ****
  
  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
--- 280,291 ----
  
  In your INTRANET VirtualHost section you should have:
!   DocumentRoot %s/htdocs
!   ScriptAlias /cgi-bin/koha/ %s/cgi-bin/
!   SetEnv PERL5LIB %s/modules
  
  In the OPAC VirtualHost section you should have:
!   DocumentRoot %s/htdocs
!   ScriptAlias /cgi-bin/koha/ %s/cgi-bin/
!   SetEnv PERL5LIB %s/modules
  
  You may also need to uncomment a "LoadModules env_module ... " line and 
restart
***************
*** 738,742 ****
  Does this look right?  ([Y]/N):
  |;
!     $answer = <STDIN>;
      chomp $answer;
  
--- 739,743 ----
  Does this look right?  ([Y]/N):
  |;
!     my $answer = <STDIN>;
      chomp $answer;
  
***************
*** 755,759 ****
        print "Please specify the location of your LIBRARIAN files: ";
  
!       $answer = <STDIN>;
        chomp $answer;
  
--- 756,760 ----
        print "Please specify the location of your LIBRARIAN files: ";
  
!       my $answer = <STDIN>;
        chomp $answer;
  
***************
*** 769,773 ****
        print "Please specify the location of your OPAC files: ";  
  
!       $answer = <STDIN>;
        chomp $answer;
  
--- 770,774 ----
        print "Please specify the location of your OPAC files: ";  
  
!       my $answer = <STDIN>;
        chomp $answer;
  
***************
*** 1892,1896 ****
  my $backupdir=$ENV{'prefix'}.'/backups';
  
! $answer = showmessage(getmessage('BackupDir',[$backupdir]),'free',$backupdir);
  
  if (! -e $backupdir) {
--- 1893,1897 ----
  my $backupdir=$ENV{'prefix'}.'/backups';
  
! my $answer = 
showmessage(getmessage('BackupDir',[$backupdir]),'free',$backupdir);
  
  if (! -e $backupdir) {