[Koha-cvs] CVS: koha installer.pl,1.2.2.23,1.2.2.24

[Steve Tonnesen]

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

Modified Files:
      Tag: rel-1-2
	installer.pl 
Log Message:
Added create_priv and drop_priv to koha's mysql user (needed for updating the
database), and checked for error when connecting to mysql server.


Index: installer.pl
===================================================================
RCS file: /cvsroot/koha/koha/installer.pl,v
retrieving revision 1.2.2.23
retrieving revision 1.2.2.24
diff -C2 -r1.2.2.23 -r1.2.2.24
*** installer.pl	24 Jun 2002 16:58:52 -0000	1.2.2.23
--- installer.pl	24 Jun 2002 18:04:26 -0000	1.2.2.24
***************
*** 183,188 ****
  print qq|
  
! Please provide the name of the user, who will full administrative rights to the 
! $dbname database, when authenticating from $hostname.
  
  If no user is entered it will default to $user.
--- 183,188 ----
  print qq|
  
! Please provide the name of the user, who will have full administrative rights
! to the $dbname database, when authenticating from $hostname.
  
  If no user is entered it will default to $user.
***************
*** 363,369 ****
  |;
  
- # Still need to check that all parent directories of $kohadir and $opacdir
- # exist
- 
  
  unless ( -d $kohadir ) {
--- 363,366 ----
***************
*** 449,455 ****
  
  foreach my $mysql (qw(/usr/local/mysql
!                       /opt/mysql)) {
     if ( -d $mysql ) {
!             $mysql=$mysqldir;
     }
  }
--- 446,453 ----
  
  foreach my $mysql (qw(/usr/local/mysql
!                       /opt/mysql
! 		      )) {
     if ( -d $mysql ) {
!             $mysqldir=$mysql;
     }
  }
***************
*** 475,485 ****
  =================
  |;
! system("$mysqldir/bin/mysqladmin -u$mysqluser -p$mysqlpass create $dbname");
! system("$mysqldir/bin/mysql -u$mysqluser -p$mysqlpass $dbname < koha.mysql");
! system("$mysqldir/bin/mysql -u$mysqluser -p$mysqlpass mysql -e \"insert into user (Host,User,Password) values ('$hostname','$user',password('$pass'))\"\;");
! system("$mysqldir/bin/mysql -u$mysqluser -p$mysqlpass mysql -e \"insert into db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv) values ('%','$dbname','$user','Y','Y','Y','Y');");
! system("$mysqldir/bin/mysqladmin -u$mysqluser -p$mysqlpass reload");
  
! system ("perl -I $kohadir/modules scripts/updater/updatedatabase");
  
  
--- 473,490 ----
  =================
  |;
! my $result=system("$mysqldir/bin/mysqladmin -u$mysqluser -p$mysqlpass create $dbname");
! if ($result) {
!     print "\nCouldn't connect to the MySQL server for the reason given above.";
!     print "Press <ENTER> to continue...";
!     <STDIN>;
!     print "\n";
! } else {
!     system("$mysqldir/bin/mysql -u$mysqluser -p$mysqlpass $dbname < koha.mysql");
!     system("$mysqldir/bin/mysql -u$mysqluser -p$mysqlpass mysql -e \"insert into user (Host,User,Password) values ('$hostname','$user',password('$pass'))\"\;");
!     system("$mysqldir/bin/mysql -u$mysqluser -p$mysqlpass mysql -e \"insert into db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv) values ('%','$dbname','$user','Y','Y','Y','Y','Y','Y');");
!     system("$mysqldir/bin/mysqladmin -u$mysqluser -p$mysqlpass reload");
  
!     system ("perl -I $kohadir/modules scripts/updater/updatedatabase");
! }