[Koha-cvs] CVS: koha/misc Install.pm,1.88.2.1,1.88.2.2

[MJ Ray]

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26955

Modified Files:
      Tag: rel_2_2
	Install.pm 
Log Message:
database must be last parameter to bin/mysql in some version

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.88.2.1
retrieving revision 1.88.2.2
diff -C2 -r1.88.2.1 -r1.88.2.2
*** Install.pm	24 Jan 2005 13:24:51 -0000	1.88.2.1
--- Install.pm	24 Jan 2005 13:34:19 -0000	1.88.2.2
***************
*** 1806,1811 ****
  	# Set up permissions
  	startsysout();
! 	print system("$mysqldir/bin/mysql -u$mysqluser mysql -e \"insert into user (Host,User,Password) values ('$hostname','$user',password('$pass'))\"\;");#"
! 	system("$mysqldir/bin/mysql -u$mysqluser mysql -e \"insert into db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv, index_priv, alter_priv) values ('%','$database','$user','Y','Y','Y','Y','Y','Y','Y','Y')\"");
  	system("$mysqldir/bin/mysqladmin -u$mysqluser reload");
  	# Change to admin user login
--- 1806,1811 ----
  	# Set up permissions
  	startsysout();
! 	print system("$mysqldir/bin/mysql -u$mysqluser -e \"insert into user (Host,User,Password) values ('$hostname','$user',password('$pass'))\" mysql\;");
! 	system("$mysqldir/bin/mysql -u$mysqluser -e \"insert into db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv, index_priv, alter_priv) values ('%','$database','$user','Y','Y','Y','Y','Y','Y','Y','Y')\" mysql");
  	system("$mysqldir/bin/mysqladmin -u$mysqluser reload");
  	# Change to admin user login
***************
*** 1951,1957 ****
  
  		startsysout();
! 		system("$mysqldir/bin/mysql -u$user $database -e \"insert into branches (branchcode,branchname,issuing) values ('$branchcode', '$branch', 1)\"");
! 		system("$mysqldir/bin/mysql -u$user $database -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\"");
! 		system("$mysqldir/bin/mysql -u$user $database -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\"");
  
  		my $printername='lp';
--- 1951,1957 ----
  
  		startsysout();
! 		system("$mysqldir/bin/mysql -u$user -e \"insert into branches (branchcode,branchname,issuing) values ('$branchcode', '$branch', 1)\" $database");
! 		system("$mysqldir/bin/mysql -u$user -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\" $database");
! 		system("$mysqldir/bin/mysql -u$user -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\" $database");
  
  		my $printername='lp';
***************
*** 1972,1976 ****
  		}
  		startsysout();	
! 		system("$mysqldir/bin/mysql -u$user $database -e \"insert into printers (printername,printqueue,printtype) values ('$printername', '$printerqueue', '')\"");
  	}
  	my $language;
--- 1972,1976 ----
  		}
  		startsysout();	
! 		system("$mysqldir/bin/mysql -u$user -e \"insert into printers (printername,printqueue,printtype) values ('$printername', '$printerqueue', '')\" $database");
  	}
  	my $language;
***************
*** 1982,1986 ****
  	}
  	startsysout();	
! 	system("$mysqldir/bin/mysql -u$user $database -e \"update systempreferences set value='$language' where variable='opaclanguages'\"");
  	my @dirs;
  	if (-d "scripts/misc/sql-datas") {
--- 1982,1986 ----
  	}
  	startsysout();	
! 	system("$mysqldir/bin/mysql -u$user -e \"update systempreferences set value='$language' where variable='opaclanguages'\" $database");
  	my @dirs;
  	if (-d "scripts/misc/sql-datas") {