[Koha-cvs] CVS: koha Install.pm,1.1.2.3,1.1.2.4 installer.pl,1.2.2.62,1.2.2.63

[Steve Tonnesen]

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

Modified Files:
      Tag: rel-1-2
        Install.pm installer.pl 
Log Message:
Almost done modularizing installer.pl


Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/Attic/Install.pm,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** Install.pm  24 Jul 2002 22:23:13 -0000      1.1.2.3
--- Install.pm  25 Jul 2002 17:34:38 -0000      1.1.2.4
***************
*** 20,23 ****
--- 20,25 ----
                &updateapacheconf
                &basicauthentication
+               &installfiles
+               &databasesetup
                );
  
***************
*** 137,140 ****
--- 139,151 ----
  Intranet Directory [%s]: |;
  
+ $messages->{'GetKohaLogDir'}->{en}=qq|
+ ======================
+ = KOHA LOG DIRECTORY =
+ ======================
+ 
+ Specify a log directory where any Koha daemons can create log files.
+ 
+ Koha Log Directory [%s]: |;
+ 
  sub releasecandidatewarning {
      my $message=getmessage('ReleaseCandidateWarning', [$::kohaversion, 
$::kohaversion]);
***************
*** 304,308 ****
        }
      }
!     return ($::opacdir, $::intranetdir);
  }
  
--- 315,389 ----
        }
      }
!     $::kohalogdir='/var/log/koha';
!     my $message=getmessage('GetKohaLogDir', [$::kohalogdir]);
!     $::kohalogdir=showmessage($message, 'free', $::kohalogdir);
! 
! 
!     unless ( -d $::intranetdir ) {
!        my $result=mkdir ($::intranetdir, oct(770));
!        if ($result==0) {
!          my @dirs = split(m#/#, $::intranetdir);
!           my $checkdir='';
!           foreach (@dirs) {
!               $checkdir.="$_/";
!               unless (-e "$checkdir") {
!                   mkdir($checkdir, 0775);
!               }
!           }
!        }
!        chown (oct(0), (getgrnam($::httpduser))[2], "$::intranetdir");
!        chmod (oct(770), "$::intranetdir");
!     }
!     unless ( -d "$::intranetdir/htdocs" ) {
!        mkdir ("$::intranetdir/htdocs", oct(750));
!     }
!     unless ( -d "$::intranetdir/cgi-bin" ) {
!        mkdir ("$::intranetdir/cgi-bin", oct(750));
!     }
!     unless ( -d "$::intranetdir/modules" ) {
!        mkdir ("$::intranetdir/modules", oct(750));
!     }
!     unless ( -d "$::intranetdir/scripts" ) {
!        mkdir ("$::intranetdir/scripts", oct(750));
!     }
!     unless ( -d $::opacdir ) {
!        my $result=mkdir ($::opacdir, oct(770));
!        if ($result==0) {
!          my @dirs = split(m#/#, $::opacdir);
!           my $checkdir='';
!           foreach (@dirs) {
!               $checkdir.="$_/";
!               unless (-e "$checkdir") {
!                   mkdir($checkdir, 0775);
!               }
!           }
!        }
!        chown (oct(0), (getgrnam($::httpduser))[2], "$::opacdir");
!        chmod (oct(770), "$::opacdir");
!     }
!     unless ( -d "$::opacdir/htdocs" ) {
!        mkdir ("$::opacdir/htdocs", oct(750));
!     }
!     unless ( -d "$::opacdir/cgi-bin" ) {
!        mkdir ("$::opacdir/cgi-bin", oct(750));
!     }
! 
! 
!     unless ( -d $::kohalogdir ) {
!        my $result=mkdir ($::kohalogdir, oct(770));
!        if ($result==0) {
!          my @dirs = split(m#/#, $::kohalogdir);
!           my $checkdir='';
!           foreach (@dirs) {
!               $checkdir.="$_/";
!               unless (-e "$checkdir") {
!                   mkdir($checkdir, 0775);
!               }
!           }
!        }
! 
!        chown (oct(0), (getgrnam($::httpduser))[2,3], "$::kohalogdir");
!        chmod (oct(770), "$::kohalogdir");
!     }
  }
  
***************
*** 616,621 ****
  
  $messages->{'ApacheAlreadyConfigured'}->{en}=qq|
! $::realhttpdconf appears to already have an entry for Koha
! Virtual Hosts.  You may need to edit $::realhttpdconf
  f anything has changed since it was last set up.  This
  script will not attempt to modify an existing Koha apache
--- 697,706 ----
  
  $messages->{'ApacheAlreadyConfigured'}->{en}=qq|
! =============================
! = APACHE ALREADY CONFIGURED =
! =============================
! 
! %s appears to already have an entry for Koha
! Virtual Hosts.  You may need to edit %s
  f anything has changed since it was last set up.  This
  script will not attempt to modify an existing Koha apache
***************
*** 675,679 ****
      
      if (`grep 'VirtualHost $::servername' $::realhttpdconf`) {
!       showmessage(getmessage('ApacheAlreadyConfigured'), 'PressEnter');
        return;
      } else {
--- 760,764 ----
      
      if (`grep 'VirtualHost $::servername' $::realhttpdconf`) {
!       showmessage(getmessage('ApacheAlreadyConfigured', [$::realhttpdconf, 
$::realhttpdconf]), 'PressEnter');
        return;
      } else {
***************
*** 792,797 ****
--- 877,1097 ----
  }
  
+ $messages->{'InstallFiles'}->{en}=qq|
+ ====================
+ = INSTALLING FILES =
+ ====================
+ 
+ Copying files to installation directories:
+ 
+ |;
+ 
+ 
+ $messages->{'CopyingFiles'}->{en}="Copying %s to %s.\n";
+ 
+ 
  
+ sub installfiles {
  
+ 
+     showmessage(getmessage('InstallFiles'),'none');
+     print getmessage('CopyingFiles', ['internet-html', 
"$::intranetdir/htdocs" ]);
+     system("cp -R intranet-html/* $::intranetdir/htdocs/");
+     print getmessage('CopyingFiles', ['internet-cgi', 
"$::intranetdir/cgi-bin" ]);
+     system("cp -R intranet-cgi/* $::intranetdir/cgi-bin/");
+     print getmessage('CopyingFiles', ['stand-alone scripts', 
"$::intranetdir/scripts" ]);
+     system("cp -R scripts/* $::intranetdir/scripts/");
+     print getmessage('CopyingFiles', ['perl modules', 
"$::intranetdir/modules" ]);
+     system("cp -R modules/* $::intranetdir/modules/");
+     print getmessage('CopyingFiles', ['opac-html', "$::opacdir/htdocs" ]);
+     system("cp -R opac-html/* $::opacdir/htdocs/");
+     print getmessage('CopyingFiles', ['opac-cgi', "$::opacdir/cgi-bin" ]);
+     system("cp -R opac-cgi/* $::opacdir/cgi-bin/");
+ 
+     system("chown -R root.$::httpduser $::opacdir");
+     system("chown -R root.$::httpduser $::intranetdir");
+ 
+     # Create /etc/koha.conf
+ 
+     open(KC,">$::etcdir/koha.conf") or warn "Couldn't create file
+     at $::etcdir.  Must have write capability.\n";
+     print KC qq|
+ database=$::dbname
+ hostname=$::hostname
+ user=$::user
+ pass=$::pass
+ includes=$::intranetdir/htdocs/includes
+ intranetdir=$::intranetdir
+ opacdir=$::opacdir
+ kohalogdir=$::kohalogdir
+ kohaversion=$::kohaversion
+ httpduser=$::httpduser
+ |;
+     close(KC);
+ 
+     chown((getpwnam($::httpduser)) [2,3], "$::etcdir/koha.conf") or warn 
"can't chown koha.conf: $!";
+     chmod 0440, "$::etcdir/koha.conf";
+ }
+ 
+ $messages->{'MysqlRootPassword'}->{en}=qq|
+ ============================
+ = MYSQL ROOT USER PASSWORD =
+ ============================
+ 
+ To allow us to create the koha database please supply your
+ mysql server's root user password:
+ 
+ Enter MySql root user password: |;
+ 
+ $messages->{'InvalidMysqlRootPassword'}->{en}="Invalid Password.  Please try 
again.";
+ 
+ $messages->{'CreatingDatabase'}->{en}=qq|
+ =====================
+ = CREATING DATABASE =
+ =====================
+ 
+ Creating the MySql database for Koha...
+ 
+ |;
+ 
+ $messages->{'CreatingDatabaseError'}->{en}=qq|
+ ===========================
+ = ERROR CREATING DATABASE =
+ ===========================
+ 
+ Couldn't connect to the MySQL server for the reason given above.
+ This is a serious problem, the database will not get installed.
+ 
+ Press <ENTER> to continue: |;
+ 
+ $messages->{'SampleData'}->{en}=qq|
+ ===============
+ = SAMPLE DATA =
+ ===============
+ 
+ If you are installing Koha for evaluation purposes,  I have a batch of sample
+ data that you can install now.
+ 
+ If you are installing Koha with the intention of populating it with your own
+ data, you probably don't want this sample data installed.
+ 
+ Would you like to install the sample data? Y/[N]: |;
+ 
+ $messages->{'SampleDataInstalled'}->{en}=qq|
+ =========================
+ = SAMPLE DATA INSTALLED =
+ =========================
+ 
+ Sample data has been installed.  For some suggestions on testing Koha, please
+ read the file doc/HOWTO-Testing.  If you find any bugs, please submit them at
+ http://bugs.koha.org/.  If you need help with testing Koha, you can post a
+ question through the koha-devel mailing list, or you can check for a developer
+ online at +irc.katipo.co.nz:6667 channel #koha.
+ 
+ You can find instructions for subscribing to the Koha mailing lists at:
+ 
+     http://www.koha.org
+ 
+ 
+ Press <ENTER> to continue: |;
+ 
+ $messages->{'AddBranchPrinter'}->{en}=qq|
+ ==========================
+ = Add Branch and Printer =
+ ==========================
+ 
+ Would you like to install an initial branch and printer? [Y]/N: |;
+ 
+ $messages->{'BranchName'}->{en}="Branch Name [%s]: ";
+ $messages->{'BranchCode'}->{en}="Branch Code (4 letters or numbers) [%s]: ";
+ $messages->{'PrinterQueue'}->{en}="Printer Queue [%s]: ";
+ $messages->{'PrinterName'}->{en}="Printer Name [%s]: ";
+ 
+ sub databasesetup {
+     my $mysqldir;
+     $::mysqluser = 'root';
+     $::mysqlpass = '';
+ 
+     foreach my $mysql (qw(/usr/local/mysql
+                         /opt/mysql
+                         )) {
+        if ( -d $mysql ) {
+               $mysqldir=$mysql;
+        }
+     }
+     if (!$mysqldir){
+       $mysqldir='/usr';
+     }
+ 
+ 
+     my $needpassword=1;
+     while ($needpassword) {
+       $::mysqlpass=showmessage(getmessage('MysqlRootPassword'), 'free');
+       my $result=system("$mysqldir/bin/mysqladmin -u$::mysqluser 
-p$::mysqlpass proc > /dev/null 2>&1");
+       if ($result) {
+           print getmessage('InvalidMysqlRootPassword');
+       } else {
+           $needpassword=0;
+       }
+     }
+ 
+     showmessage(getmessage('CreatingDatabase'),'none');
+ 
+     my $result=system("$mysqldir/bin/mysqladmin -u$::mysqluser -p$::mysqlpass 
create $::dbname");
+     if ($result) {
+       showmessage(getmessage('CreatingDatabaseError'),'PressEnter', '', 1);
+     } 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,
 index_priv, alter_priv) values 
('%','$::dbname','$::user','Y','Y','Y','Y','Y','Y','Y','Y')\"");
+       system("$mysqldir/bin/mysqladmin -u$::mysqluser -p$::mysqlpass reload");
+ 
+       system ("perl -I $::intranetdir/modules 
scripts/updater/updatedatabase");
+ 
+ 
+       my $response=showmessage(getmessage('SampleData'), 'yn', 'n');
+       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 printers (printername,printqueue,printtype) values 
('Circulation Desk Printer', 'lp', 'hp')\"");
+           showmessage(getmessage('SampleDataInstalled'), 'PressEnter');
+       } else {
+           my $input;
+           my $response=showmessage(getmessage('AddBranchPrinter'), 'yn', 'y');
+ 
+           unless ($response =~/^n/i) {
+               my $branch='Main Library';
+               print "Enter a name for the library branch [$branch]: ";
+               $branch=showmessage(getmessage('BranchName', [$branch]), 
'free', $branch, 1);
+               $branch=~s/[^A-Za-z0-9\s]//g;
+ 
+               my $branchcode=$branch;
+               $branchcode=~s/[^A-Za-z0-9]//g;
+               $branchcode=uc($branchcode);
+               $branchcode=substr($branchcode,0,4);
+               $branchcode=showmessage(getmessage('BranchCode', 
[$branchcode]), 'free', $branchcode, 1);
+               $branchcode=~s/[^A-Z]//g;
+               $branchcode=uc($branchcode);
+               $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)\"");
+ 
+               my $printername='Library Printer';
+               $printername=showmessage(getmessage('PrinterName', 
[$printername]), 'free', $printername, 1);
+               $printername=~s/[^A-Za-z0-9\s]//g;
+ 
+               my $printerqueue='lp';
+               $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', '')\"");
+ 
+           }
+       }
+ 
+ 
+     }
+ 
+ }
  
  END { }       # module clean-up code here (global destructor)

Index: installer.pl
===================================================================
RCS file: /cvsroot/koha/koha/installer.pl,v
retrieving revision 1.2.2.62
retrieving revision 1.2.2.63
diff -C2 -r1.2.2.62 -r1.2.2.63
*** installer.pl        24 Jul 2002 22:23:13 -0000      1.2.2.62
--- installer.pl        25 Jul 2002 17:34:38 -0000      1.2.2.63
***************
*** 64,80 ****
  $::domainname = `hostname -d`;
  chomp $::domainname;
  
  
  # Check for missing Perl Modules
- 
  checkperlmodules();
  
- 
  # Ask for installation directories
- 
  getinstallationdirectories();
  
- $::etcdir = '/etc';
- 
  getdatabaseinfo();
  
--- 64,76 ----
  $::domainname = `hostname -d`;
  chomp $::domainname;
+ $::etcdir = '/etc';
  
  
  # Check for missing Perl Modules
  checkperlmodules();
  
  # Ask for installation directories
  getinstallationdirectories();
  
  getdatabaseinfo();
  
***************
*** 85,392 ****
  updateapacheconf();
  
- 
  basicauthentication();
  
  
! exit;
! 
  
- print qq|
- 
- SETTING UP Z39.50 DAEMON
- ========================
- |;
- 
- my $kohalogdir='/var/log/koha';
- print "Directory for logging by Z39.50 daemon [$kohalogdir]: ";
- chomp($input = <STDIN>);
- if ($input) {
-     $kohalogdir=$input;
- }
  
! unless (-e "$kohalogdir") {
!     my $result = mkdir 0770, "$kohalogdir"; 
!     if ($result==0) {
!         my @dirs = split(m#/#, $kohalogdir);
!       my $checkdir='';
!       foreach (@dirs) {
!           $checkdir.="$_/";
!           unless (-e "$checkdir") {
!               mkdir($checkdir, 0775);
!           }
!       }
!     }
! }
! 
! #
! # Setup the modules directory
! #
! print qq|
! 
! CREATING REQUIRED DIRECTORIES
! =============================
! 
! |;
! 
! 
! unless ( -d $::intranetdir ) {
!    print "Creating $::intranetdir...\n";
!    my $result=mkdir ($::intranetdir, oct(770));
!    if ($result==0) {
!        my @dirs = split(m#/#, $::intranetdir);
!       my $checkdir='';
!       foreach (@dirs) {
!           $checkdir.="$_/";
!           unless (-e "$checkdir") {
!               mkdir($checkdir, 0775);
!           }
!       }
!    }
!    chown (oct(0), (getgrnam($::httpduser))[2], "$::intranetdir");
!    chmod (oct(770), "$::intranetdir");
! }
! unless ( -d "$::intranetdir/htdocs" ) {
!    print "Creating $::intranetdir/htdocs...\n";
!    mkdir ("$::intranetdir/htdocs", oct(750));
! }
! unless ( -d "$::intranetdir/cgi-bin" ) {
!    print "Creating $::intranetdir/cgi-bin...\n";
!    mkdir ("$::intranetdir/cgi-bin", oct(750));
! }
! unless ( -d "$::intranetdir/modules" ) {
!    print "Creating $::intranetdir/modules...\n";
!    mkdir ("$::intranetdir/modules", oct(750));
! }
! unless ( -d "$::intranetdir/scripts" ) {
!    print "Creating $::intranetdir/scripts...\n";
!    mkdir ("$::intranetdir/scripts", oct(750));
! }
! unless ( -d $::opacdir ) {
!    print "Creating $::opacdir...\n";
!    my $result=mkdir ($::opacdir, oct(770));
!    if ($result==0) {
!        my @dirs = split(m#/#, $::opacdir);
!       my $checkdir='';
!       foreach (@dirs) {
!           $checkdir.="$_/";
!           unless (-e "$checkdir") {
!               mkdir($checkdir, 0775);
!           }
!       }
!    }
!    chown (oct(0), (getgrnam($::httpduser))[2], "$::opacdir");
!    chmod (oct(770), "$::opacdir");
! }
! unless ( -d "$::opacdir/htdocs" ) {
!    print "Creating $::opacdir/htdocs...\n";
!    mkdir ("$::opacdir/htdocs", oct(750));
! }
! unless ( -d "$::opacdir/cgi-bin" ) {
!    print "Creating $::opacdir/cgi-bin...\n";
!    mkdir ("$::opacdir/cgi-bin", oct(750));
! }
! 
! 
! 
! print "\n\nINSTALLING KOHA...\n";
! print "\n\n==================\n";
! print "Copying internet-html files to $::intranetdir/htdocs...\n";
! system("cp -R intranet-html/* $::intranetdir/htdocs/");
! print "Copying intranet-cgi files to $::intranetdir/cgi-bin...\n";
! system("cp -R intranet-cgi/* $::intranetdir/cgi-bin/");
! print "Copying script files to $::intranetdir/scripts...\n";
! system("cp -R scripts/* $::intranetdir/scripts/");
! print "Copying module files to $::intranetdir/modules...\n";
! system("cp -R modules/* $::intranetdir/modules/");
! print "Copying opac-html files to $::opacdir/htdocs...\n";
! system("cp -R opac-html/* $::opacdir/htdocs/");
! print "Copying opac-cgi files to $::opacdir/cgi-bin...\n";
! system("cp -R opac-cgi/* $::opacdir/cgi-bin/");
! 
! system("chown -R root.$::httpduser $::opacdir");
! system("chown -R root.$::httpduser $::intranetdir");
! 
! 
! print qq|
! 
! KOHA.CONF
! =========
! Koha uses a small configuration file that is placed in your /etc/ files
! directory. The configuration file, will be created in this directory.
! 
! |;
! 
! #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=$::intranetdir/htdocs/includes
! intranetdir=$::intranetdir
! opacdir=$::opacdir
! kohalogdir=$kohalogdir
! kohaversion=$::kohaversion
! httpduser=$::httpduser
! EOP
! ;
! close(SITES);
! 
! #
! # Set ownership of the koha.conf file for security
! #
! chown((getpwnam($::httpduser)) [2,3], "$::etcdir/koha.conf") or warn "can't 
chown koha.conf: $!";
! chmod 0440, "$::etcdir/koha.conf";
! 
! 
! print "Successfully created the Koha configuration file.\n";
! 
! print qq|
! 
! MYSQL CONFIGURATION
! ===================
! |;
! my $mysql;
! my $mysqldir;
! my $mysqluser = 'root';
! my $mysqlpass = '';
! 
! foreach my $mysql (qw(/usr/local/mysql
!                       /opt/mysql
!                     )) {
!    if ( -d $mysql ) {
!             $mysqldir=$mysql;
!    }
! }
! if (!$mysqldir){
!     $mysqldir='/usr';
! }
! print qq|
! To allow us to create the koha database please supply the 
! mysql\'s root users password
! |;
! 
! 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;
!     }
! }
! 
! 
! print qq|
! 
! CREATING DATABASE
! =================
! |;
! 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.\n";
!     print "This is a serious problem, the database will not get 
installed.\n";
!     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,
 index_priv, alter_priv) values 
('%','$::dbname','$::user','Y','Y','Y','Y','Y','Y','Y','Y')\"");
!     system("$mysqldir/bin/mysqladmin -u$mysqluser -p$mysqlpass reload");
! 
!     system ("perl -I $::intranetdir/modules scripts/updater/updatedatabase");
! 
! 
!     print qq|
! 
! SAMPLE DATA
! ===========
! If you are installing Koha for evaluation purposes,  I have a batch of sample
! data that you can install now.
! 
! If you are installing Koha with the intention of populating it with your own
! data, you probably don't want this sample data installed.
! |;
!     print "\nWould you like to install the sample data? Y/[N]: ";
!     chomp($input = <STDIN>);
!     if ($input =~/^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 printers (printername,printqueue,printtype) values ('Circulation 
Desk Printer', 'lp', 'hp')\"");
!       print qq|
! 
! Sample data has been installed.  For some suggestions on testing Koha, please
! read the file doc/HOWTO-Testing.  If you find any bugs, please submit them at
! http://bugs.koha.org/.  If you need help with testing Koha, you can post a
! question through the koha-devel mailing list, or you can check for a developer
! online at +irc.katipo.co.nz:6667 channel #koha.
! 
! You can find instructions for subscribing to the Koha mailing lists at:
! 
!     http://www.koha.org
! 
! 
! Press <ENTER> to continue...
! |;
!       <STDIN>;
!     } else {
!       print "\n\nWould you like to add a branch and printer? [Y]/N: ";
!       chomp($input = <STDIN>);
! 
! 
!       unless ($input =~/^n/i) {
!           my $branch='Main Library';
!           print "Enter a name for the library branch [$branch]: ";
!           chomp($input = <STDIN>);
!           if ($input) {
!               $branch=$input;
!           }
!           $branch=~s/[^A-Za-z0-9\s]//g;
!           my $branchcode=$branch;
!           $branchcode=~s/[^A-Za-z0-9]//g;
!           $branchcode=uc($branchcode);
!           $branchcode=substr($branchcode,0,4);
!           print "Enter a four letter code for your branch [$branchcode]: ";
!           chomp($input = <STDIN>);
!           if ($input) {
!               $branchcode=$input;
!           }
!           $branchcode=~s/[^A-Z]//g;
!           $branchcode=uc($branchcode);
!           $branchcode=substr($branchcode,0,4);
!           print "Adding branch '$branch' with code '$branchcode'.\n";
!           system("$mysqldir/bin/mysql -u$mysqluser -p$mysqlpass $::dbname -e 
\"insert into branches (branchcode,branchname,issuing) values ('$branchcode', 
'$branch', 1)\"");
!           my $printername='Library Printer';
!           print "Enter a name for the printer [$printername]: ";
!           chomp($input = <STDIN>);
!           if ($input) {
!               $printername=$input;
!           }
!           $printername=~s/[^A-Za-z0-9\s]//g;
!           my $printerqueue='lp';
!           print "Enter the queue for the printer [$printerqueue]: ";
!           chomp($input = <STDIN>);
!           if ($input) {
!               $printerqueue=$input;
!           }
!           $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', '')\"");
!       }
!     }
! 
! 
! }
  
  
- chmod 0770, $kohalogdir;
- chown((getpwnam($::httpduser)) [2,3], $kohalogdir) or warn "can't chown 
$kohalogdir: $!";
  
  # LAUNCH SCRIPT
--- 81,94 ----
  updateapacheconf();
  
  basicauthentication();
  
+ installfiles();
  
! databasesetup();
  
  
! exit;
  
  
  
  # LAUNCH SCRIPT
***************
*** 420,424 ****
        $newfile.="KohaZ3950Dir=$::intranetdir/scripts/z3950daemon\n";
      } elsif (/^LogDir=/) {
!       $newfile.="LogDir=$kohalogdir\n";
      } else {
        $newfile.=$_;
--- 122,126 ----
        $newfile.="KohaZ3950Dir=$::intranetdir/scripts/z3950daemon\n";
      } elsif (/^LogDir=/) {
!       $newfile.="LogDir=$::kohalogdir\n";
      } else {
        $newfile.=$_;