[Koha-cvs] CVS: koha/misc Install.pm,1.64,1.65 koha.upgrade,1.13,1.14

[MJ Ray]

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

Modified Files:
	Install.pm koha.upgrade 
Log Message:
z3950 fixes and version display fixes

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -r1.64 -r1.65
*** Install.pm	31 Oct 2003 17:58:16 -0000	1.64
--- Install.pm	5 Nov 2003 23:31:10 -0000	1.65
***************
*** 370,373 ****
--- 370,385 ----
  }
  
+ =item getkohaversion
+ 
+     getkohaversion();
+ 
+ Gets the Koha version as known by the previous config file.
+ 
+ =cut
+ 
+ sub getkohaversion ($) {
+     return($kohaversion);
+ }
+ 
  =item setkohaversion
  
***************
*** 1582,1586 ****
  	#MJR: generate our own settings, to remove the /home/paul hardwired links
      open(FILE,">$intranetdir/scripts/z3950daemon/z3950-daemon-options");
!     print FILE "RunAsUser=apache\nKohaZ3950Dir=$intranetdir/scripts/z3950daemon\nKohaModuleDir=$intranetdir/modules\nLogDir=$kohalogdir\nKohaConf=$etcdir/koha.conf";
      close(FILE);
  
--- 1594,1598 ----
  	#MJR: generate our own settings, to remove the /home/paul hardwired links
      open(FILE,">$intranetdir/scripts/z3950daemon/z3950-daemon-options");
!     print FILE "RunAsUser=$httpduser\nKohaZ3950Dir=$intranetdir/scripts/z3950daemon\nKohaModuleDir=$intranetdir/modules\nLogDir=$kohalogdir\nKohaConf=$etcdir/koha.conf";
      close(FILE);
  
***************
*** 1589,1593 ****
      	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: $!";
! 	} #MJR: FIXME: Should report that we haven't chown()d.
  
      showmessage(getmessage('OldFiles'),'PressEnter');
--- 1601,1608 ----
      	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: $!";
! 	} #MJR: report that we haven't chown()d.
! 	else {
! 		print "Please check permissions in $intranetdir/scripts/z3950daemon\n";
! 	}
  
      showmessage(getmessage('OldFiles'),'PressEnter');

Index: koha.upgrade
===================================================================
RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** koha.upgrade	31 Oct 2003 17:58:16 -0000	1.13
--- koha.upgrade	5 Nov 2003 23:31:10 -0000	1.14
***************
*** 15,19 ****
  loadconfigfile();
  
! ($::kohaversion) || ($::kohaversion='unknown version');
  $::newversion=`cat koha.version`;
  chomp $::newversion;
--- 15,19 ----
  loadconfigfile();
  
! ($::kohaversion = Install::getkohaversion() ) || ($::kohaversion='unknown version');
  $::newversion=`cat koha.version`;
  chomp $::newversion;