[Koha-cvs] CVS: koha/misc koha.upgrade,1.7,1.8

[MJ Ray]

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

Modified Files:
	koha.upgrade 
Log Message:
Initial changes so that I can test. /etc still hardcoded. z3950 installation buggy. Really needs merge with Install.pm, which I will nw start on.

Index: koha.upgrade
===================================================================
RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** koha.upgrade	25 Oct 2003 09:53:54 -0000	1.7
--- koha.upgrade	26 Oct 2003 12:21:14 -0000	1.8
***************
*** 7,15 ****
  $::language='en';
  
- if ($<) {
- 	print "\n\nYou must run koha.upgrade as root.\n\n";
- 	exit;
- }
- 
  ###############################################
  # SET  THE  etcdir  ENVIRONMENT  VAR  INSTEAD #
--- 7,10 ----
***************
*** 60,64 ****
  checkperlmodules();
  
! my $backupdir='/usr/local/koha/backups';
  print "Please specify a backup directory [$backupdir]: ";
  
--- 55,59 ----
  checkperlmodules();
  
! my $backupdir=($ENV{prefix}||'/usr/local/koha').'/backups';
  print "Please specify a backup directory [$backupdir]: ";
  
***************
*** 189,193 ****
  
    OPAC:      $::opacdir
!   INTRANET:  $::intranetdir
  
  
--- 184,188 ----
  
    OPAC:      $::opacdir
!   LIBRARIAN: $::intranetdir
  
  
***************
*** 210,214 ****
      $::opacdir='';
      while (!$::intranetdir) {
! 	print "Please specify the location of your INTRANET files: ";
  
  	$answer = <STDIN>;
--- 205,209 ----
      $::opacdir='';
      while (!$::intranetdir) {
! 	print "Please specify the location of your LIBRARIAN files: ";
  
  	$answer = <STDIN>;
***************
*** 306,310 ****
  I was not able to determine the user that Apache is running as.  This
  information is necessary in order to set the access privileges correctly on
! /etc/koha.conf.  This user should be set in one of the Apache configuration
  files using the "User" directive.
  |;
--- 301,305 ----
  I was not able to determine the user that Apache is running as.  This
  information is necessary in order to set the access privileges correctly on
! koha.conf.  This user should be set in one of the Apache configuration
  files using the "User" directive.
  |;
***************
*** 470,474 ****
  using basic authentication on your intranet, you will be required to log in to
  access some of the features of the intranet.  You can log in using the userid
! and password from the /etc/koha.conf configuration file at any time.  Use the
  "Members" module to add passwords for other accounts and set their permissions.
  |;
--- 465,469 ----
  using basic authentication on your intranet, you will be required to log in to
  access some of the features of the intranet.  You can log in using the userid
! and password from the koha.conf configuration file at any time.  Use the
  "Members" module to add passwords for other accounts and set their permissions.
  |;