[Koha-cvs] CVS: koha Install.pm,1.1.2.17,1.1.2.18 installer.pl,1.2.2.66,1.2.2.67

[Steve Tonnesen]

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv25034

Modified Files:
      Tag: rel-1-2
        Install.pm installer.pl 
Log Message:
Installer script wasn't renaming koha.conf.tmp to koha.conf


Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/Attic/Install.pm,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -C2 -r1.1.2.17 -r1.1.2.18
*** Install.pm  21 Oct 2002 17:05:06 -0000      1.1.2.17
--- Install.pm  23 Oct 2002 15:34:11 -0000      1.1.2.18
***************
*** 1247,1253 ****
  }
  
- # Installation is complete.  Rename the koha.conf.tmp file
- 
- rename "$::etcdir/koha.conf.tmp", "$::etcdir/koha.conf" || warn "Couldn't 
rename file at $::etcdir. Must have write capability.\n";
  
  sub loadconfigfile {
--- 1247,1250 ----

Index: installer.pl
===================================================================
RCS file: /cvsroot/koha/koha/installer.pl,v
retrieving revision 1.2.2.66
retrieving revision 1.2.2.67
diff -C2 -r1.2.2.66 -r1.2.2.67
*** installer.pl        19 Sep 2002 19:34:26 -0000      1.2.2.66
--- installer.pl        23 Oct 2002 15:34:11 -0000      1.2.2.67
***************
*** 94,97 ****
--- 94,102 ----
  restartapache();
  
+ 
+ # Installation is complete.  Rename the koha.conf.tmp file
+ 
+ rename "$::etcdir/koha.conf.tmp", "$::etcdir/koha.conf" || warn "Couldn't 
rename file at $::etcdir. Must have write capability.\n";
+ 
  showmessage(getmessage('AuthenticationWarning'), 'PressEnter');