[Koha-cvs] CVS: koha Install.pm,1.1.2.20,1.1.2.21

[Steve Tonnesen]

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

Modified Files:
      Tag: rel-1-2
	Install.pm 
Log Message:
Quoting mysqld password in command line calls.


Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/Attic/Install.pm,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -C2 -r1.1.2.20 -r1.1.2.21
*** Install.pm	23 Oct 2002 16:30:14 -0000	1.1.2.20
--- Install.pm	25 Nov 2002 20:45:20 -0000	1.1.2.21
***************
*** 1156,1160 ****
      showmessage(getmessage('CreatingDatabase'),'none');
  
!     my $result=system("$::mysqldir/bin/mysqladmin -u$::mysqluser -p$::mysqlpass create $::dbname");
      if ($result) {
  	showmessage(getmessage('CreatingDatabaseError'),'PressEnter', '', 1);
--- 1156,1160 ----
      showmessage(getmessage('CreatingDatabase'),'none');
  
!     my $result=system("$::mysqldir/bin/mysqladmin", "-u$::mysqluser", "-p$::mysqlpass", "create", "$::dbname");
      if ($result) {
  	showmessage(getmessage('CreatingDatabaseError'),'PressEnter', '', 1);
***************
*** 1189,1198 ****
      if ($response =~/^y/i) {
  	system("gunzip sampledata-1.2.gz");
! 	system("cat sampledata-1.2 | $::mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname");
  	system("gzip -9 sampledata-1.2");
! 	system("$::mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname -e \"insert into branches (branchcode,branchname,issuing) values ('MAIN', 'Main Library', 1)\"");
! 	system("$::mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\"");
! 	system("$::mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\"");
! 	system("$::mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname -e \"insert into printers (printername,printqueue,printtype) values ('Circulation Desk Printer', 'lp', 'hp')\"");
  	showmessage(getmessage('SampleDataInstalled'), 'PressEnter','',1);
      } else {
--- 1189,1198 ----
      if ($response =~/^y/i) {
  	system("gunzip sampledata-1.2.gz");
! 	system("cat sampledata-1.2 | $::mysqldir/bin/mysql -u$::mysqluser -p\"$::mysqlpass_quoted\" $::dbname");
  	system("gzip -9 sampledata-1.2");
! 	system("$::mysqldir/bin/mysql -u$::mysqluser -\"p$::mysqlpass_quoted\" $::dbname -e \"insert into branches (branchcode,branchname,issuing) values ('MAIN', 'Main Library', 1)\"");
! 	system("$::mysqldir/bin/mysql -u$::mysqluser -p\"$::mysqlpass_quoted\" $::dbname -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\"");
! 	system("$::mysqldir/bin/mysql -u$::mysqluser -p\"$::mysqlpass_quoted\" $::dbname -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\"");
! 	system("$::mysqldir/bin/mysql -u$::mysqluser -p\"$::mysqlpass_quoted\" $::dbname -e \"insert into printers (printername,printqueue,printtype) values ('Circulation Desk Printer', 'lp', 'hp')\"");
  	showmessage(getmessage('SampleDataInstalled'), 'PressEnter','',1);
      } else {
***************
*** 1215,1221 ****
  	    $branchcode=substr($branchcode,0,4);
  
! 	    system("$::mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname -e \"insert into branches (branchcode,branchname,issuing) values ('$branchcode', '$branch', 1)\"");
! 	    system("$::mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\"");
! 	    system("$::mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\"");
  
  	    my $printername='Library Printer';
--- 1215,1221 ----
  	    $branchcode=substr($branchcode,0,4);
  
! 	    system("$::mysqldir/bin/mysql -u$::mysqluser -p\"$::mysqlpass_quoted\" $::dbname -e \"insert into branches (branchcode,branchname,issuing) values ('$branchcode', '$branch', 1)\"");
! 	    system("$::mysqldir/bin/mysql -u$::mysqluser -p\"$::mysqlpass_quoted\" $::dbname -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\"");
! 	    system("$::mysqldir/bin/mysql -u$::mysqluser -p\"$::mysqlpass_quoted\" $::dbname -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\"");
  
  	    my $printername='Library Printer';
***************
*** 1226,1230 ****
  	    $printerqueue=showmessage(getmessage('PrinterQueue', [$printerqueue]), 'free', $printerqueue, 1);
  	    $printerqueue=~s/[^A-Za-z0-9]//g;
! 	    system("$::mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname -e \"insert into printers (printername,printqueue,printtype) values ('$printername', '$printerqueue', '')\"");
  
  	}
--- 1226,1230 ----
  	    $printerqueue=showmessage(getmessage('PrinterQueue', [$printerqueue]), 'free', $printerqueue, 1);
  	    $printerqueue=~s/[^A-Za-z0-9]//g;
! 	    system("$::mysqldir/bin/mysql -u$::mysqluser -p\"$::mysqlpass_quoted\" $::dbname -e \"insert into printers (printername,printqueue,printtype) values ('$printername', '$printerqueue', '')\"");
  
  	}