[Koha-cvs] CVS: koha/misc Install.pm,1.89,1.90

[MJ Ray]

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

Modified Files:
        Install.pm 
Log Message:
possible fix for shell characters in kohaadmin user and database names

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -r1.89 -r1.90
*** Install.pm  1 Mar 2005 13:41:26 -0000       1.89
--- Install.pm  27 May 2005 13:33:42 -0000      1.90
***************
*** 3,7 ****
  
  # Copyright 2000-2002 Katipo Communications
! # Contains parts Copyright 2003-4 MJ Ray
  #
  # This file is part of Koha.
--- 3,7 ----
  
  # Copyright 2000-2002 Katipo Communications
! # Contains parts Copyright 2003-5 MJ Ray
  #
  # This file is part of Koha.
***************
*** 1817,1821 ****
                # Create the database structure
                startsysout();
!               system("$mysqldir/bin/mysql -u$user $database < koha.mysql");
        }
  
--- 1817,1821 ----
                # Create the database structure
                startsysout();
!               system("$mysqldir/bin/mysql '-u$user' '$database' < 
koha.mysql");
        }
  
***************
*** 1896,1903 ****
        startsysout();
        if ($response eq '1') {
!               system("cat scripts/misc/marc_datas/marc21_en/structure_def.sql 
| $mysqldir/bin/mysql -u$user $database");
        }
        if ($response eq '2') {
!               system("cat 
scripts/misc/marc_datas/unimarc_fr/structure_def.sql | $mysqldir/bin/mysql 
-u$user $database");
        }
        delete($ENV{"KOHA_CONF"});
--- 1896,1903 ----
        startsysout();
        if ($response eq '1') {
!               system("cat scripts/misc/marc_datas/marc21_en/structure_def.sql 
| $mysqldir/bin/mysql '-u$user' '$database'");
        }
        if ($response eq '2') {
!               system("cat 
scripts/misc/marc_datas/unimarc_fr/structure_def.sql | $mysqldir/bin/mysql 
'-u$user' '$database'");
        }
        delete($ENV{"KOHA_CONF"});
***************
*** 1952,1958 ****
  
                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';
--- 1952,1958 ----
  
                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';
***************
*** 1973,1977 ****
                }
                startsysout();  
!               system("$mysqldir/bin/mysql -u$user -e \"insert into printers 
(printername,printqueue,printtype) values ('$printername', '$printerqueue', 
'')\" $database");
        }
        my $language;
--- 1973,1977 ----
                }
                startsysout();  
!               system("$mysqldir/bin/mysql '-u$user' -e \"insert into printers 
(printername,printqueue,printtype) values ('$printername', '$printerqueue', 
'')\" '$database'");
        }
        my $language;
***************
*** 1983,1987 ****
        }
        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") {
--- 1983,1987 ----
        }
        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") {
***************
*** 2047,2051 ****
                                                unless ($response =~/^n/i) {
                                                        $FileToUpload =~ 
s/\.txt/\.sql/;
!                                                       
system("$mysqldir/bin/mysql -u$user $database 
<scripts/misc/sql-datas/$sqluploaddir/$FileToUpload");
                                                }
                                        }
--- 2047,2051 ----
                                                unless ($response =~/^n/i) {
                                                        $FileToUpload =~ 
s/\.txt/\.sql/;
!                                                       
system("$mysqldir/bin/mysql '-u$user' '$database' 
<scripts/misc/sql-datas/$sqluploaddir/$FileToUpload");
                                                }
                                        }
***************
*** 2154,2158 ****
  
  setmysqlclipass($pass); 
! open (MD, "$mysqldir/bin/mysqldump --user=$user --host=$hostname $database|");
  
  (open BF, ">$backupdir/Koha.backup_$date") || (die "Error opening up backup 
file $backupdir/Koha.backup_$date: $!\n");
--- 2154,2158 ----
  
  setmysqlclipass($pass); 
! open (MD, "$mysqldir/bin/mysqldump '--user=$user' --host=$hostname 
'$database'|");
  
  (open BF, ">$backupdir/Koha.backup_$date") || (die "Error opening up backup 
file $backupdir/Koha.backup_$date: $!\n");