[Koha-cvs] CVS: koha installer.pl,1.4,1.5

[Steve Tonnesen]

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

Modified Files:
	installer.pl 
Log Message:
Bug fixes from rel-1-2


Index: installer.pl
===================================================================
RCS file: /cvsroot/koha/koha/installer.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** installer.pl	2 Jul 2002 20:59:11 -0000	1.4
--- installer.pl	8 Jul 2002 18:34:35 -0000	1.5
***************
*** 4,7 ****
--- 4,11 ----
  use strict; # please develop with the strict pragma
  
+ if ($<) {
+     print "\n\nYou must run koha.upgrade as root.\n\n";
+     exit;
+ }
  unless ($< == 0) {
      print "You must be root to run this script.\n";
***************
*** 268,286 ****
  
  
- #Create the configuration file
- open(SITES,">$etcdir/koha.conf") or warn "Couldn't create file
- at $etcdir.  Must have write capability.\n";
- print SITES <<EOP
- database=$dbname
- hostname=$hostname
- user=$user
- pass=$pass
- includes=$kohadir/htdocs/includes
- intranetdir=$kohadir
- opacdir=$opacdir
- kohaversion=$kohaversion
- EOP
- ;
- close(SITES);
  
  print "Successfully created the Koha configuration file.\n";
--- 272,275 ----
***************
*** 309,313 ****
     }
  }
! $httpduser ||= 'Undetermined';
  
  #
--- 298,336 ----
     }
  }
! unless ($httpduser) {
!     print qq|
! 
! 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.
! |;
!     print "What is your Apache user? ";
!     chomp($input = <STDIN>);
! 
!     if ($input) {
! 	$httpduser = $input;
!     } else {
! 	$httpduser='Undetermined';
!     }
! }
! 
! 
! #Create the configuration file
! open(SITES,">$etcdir/koha.conf") or warn "Couldn't create file
! at $etcdir.  Must have write capability.\n";
! print SITES <<EOP
! database=$dbname
! hostname=$hostname
! user=$user
! pass=$pass
! includes=$kohadir/htdocs/includes
! intranetdir=$kohadir
! opacdir=$opacdir
! kohaversion=$kohaversion
! httpduser=$httpduser
! EOP
! ;
! close(SITES);
  
  #
***************
*** 675,683 ****
  |;
  
! print "Enter mysql\'s root users password: ";
! chomp($input = <STDIN>);
! 
! if ($input) {
!   $mysqlpass = $input;
  }
  
--- 698,712 ----
  |;
  
! my $needpassword=1;
! while ($needpassword) {
!     print "Enter mysql\'s root users password: ";
!     chomp($input = <STDIN>);
!     $mysqlpass = $input;
!     my $result=system("$mysqldir/bin/mysqladmin -u$mysqluser -p$mysqlpass proc > /dev/null 2>&1");
!     if ($result) {
! 	print "\n\nInvalid password for the MySql root user.\n\n";
!     } else {
! 	$needpassword=0;
!     }
  }