[Koha-cvs] CVS: koha/misc Install.pm,1.43,1.44 installer.pl,1.14,1.15

[MJ Ray]

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

Modified Files:
        Install.pm installer.pl 
Log Message:
first part of bug 490 fix

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** Install.pm  7 Jul 2003 20:58:48 -0000       1.43
--- Install.pm  9 Jul 2003 00:16:22 -0000       1.44
***************
*** 109,118 ****
  $termios->getattr();
  my $terminal = Term::Cap->Tgetent({OSPEED=>$termios->getospeed()});
! my $clear_string = $terminal->Tputs('cl');
  
  sub heading ($) {
    my $title = shift;
    my $bal = 5;
!   return($clear_string."koha-".$kohaversion." 
Installer\n".ON_BLUE.WHITE.BOLD." "x$bal.uc($title)." "x$bal.RESET."\n\n");
  }
  
--- 109,118 ----
  $termios->getattr();
  my $terminal = Term::Cap->Tgetent({OSPEED=>$termios->getospeed()});
! my $clear_string = "\n\n"; #MJR: was $terminal->Tputs('cl');
  
  sub heading ($) {
    my $title = shift;
    my $bal = 5;
!   return($clear_string.ON_BLUE.WHITE.BOLD." "x$bal.uc($title)." 
"x$bal.RESET."\n\n");
  }
  
***************
*** 447,451 ****
      my $messagename=shift;
      my $variables=shift;
!     my $message=$messages->{$messagename}->{$language} || 
$messages->{$messagename}->{en} || "Error: No message named $messagename in 
Install.pm\n";
      if (defined($variables)) {
        $message=sprintf $message, @$variables;
--- 447,451 ----
      my $messagename=shift;
      my $variables=shift;
!     my $message=$messages->{$messagename}->{$language} || 
$messages->{$messagename}->{en} || RED.BOLD."Error: No message named 
$messagename in Install.pm\n";
      if (defined($variables)) {
        $message=sprintf $message, @$variables;
***************
*** 522,526 ****
      #MJR: Maybe refactor to use anonymous functions that
      # check the responses instead of RnP branching.
!     my $message=shift;
      my $responsetype=shift;
      my $defaultresponse=shift;
--- 522,526 ----
      #MJR: Maybe refactor to use anonymous functions that
      # check the responses instead of RnP branching.
!     my $message=join('',fill('','',(shift)));
      my $responsetype=shift;
      my $defaultresponse=shift;
***************
*** 531,535 ****
        $responsetype='restrictchar ynYN';
      }
!     print $message;
      if ($responsetype =~/^restrictchar (.*)/i) {
        my $response='\0';
--- 531,535 ----
        $responsetype='restrictchar ynYN';
      }
!     print RESET.$message;
      if ($responsetype =~/^restrictchar (.*)/i) {
        my $response='\0';
***************
*** 542,553 ****
              if ( $response=~/.*[\:\(\)\^\$\*\!\\].*/ ) {
                  ($noclear) || (print $clear_string);
!                 print "Response contains invalid characters.  Choose from 
[$options].\n\n";
!                 print $message;
                  $response='\0';
              } else {
                  unless ($options=~/$response/) {
                      ($noclear) || (print $clear_string);
!                     print "Invalid Response.  Choose from [$options].\n\n";
!                     print $message;
                  }
              }
--- 542,553 ----
              if ( $response=~/.*[\:\(\)\^\$\*\!\\].*/ ) {
                  ($noclear) || (print $clear_string);
!                 print RED."Response contains invalid characters.  Choose from 
[$options].\n\n";
!                 print RESET.$message;
                  $response='\0';
              } else {
                  unless ($options=~/$response/) {
                      ($noclear) || (print $clear_string);
!                     print RED."Invalid Response.  Choose from 
[$options].\n\n";
!                     print RESET.$message;
                  }
              }
***************
*** 571,576 ****
            unless ($response=~/^\d+$/) {
                ($noclear) || (print $clear_string);
!               print "Invalid Response ($response).  Response must be a 
number.\n\n";
!               print $message;
            }
        }
--- 571,576 ----
            unless ($response=~/^\d+$/) {
                ($noclear) || (print $clear_string);
!               print RED."Invalid Response ($response).  Response must be a 
number.\n\n";
!               print RESET.$message;
            }
        }
***************
*** 585,590 ****
            if ($response!~/address@hidden/) {
                        ($noclear) || (print $clear_string);
!                       print "Invalid Response ($response).  Response must be 
a valid email address.\n\n";
!                       print $message;
            }
        }
--- 585,590 ----
            if ($response!~/address@hidden/) {
                        ($noclear) || (print $clear_string);
!                       print RED."Invalid Response ($response).  Response must 
be a valid email address.\n\n";
!                       print RESET.$message;
            }
        }
***************
*** 606,609 ****
--- 606,625 ----
  =back
  
+ =item startsysout
+ 
+       startsysout;
+ 
+ Changes the display to show system output until the next showmessage call.
+ At the time of writing, this means using red text.
+ 
+ =cut
+ 
+ sub startsysout {
+       print RED."\n";
+ }
+ 
+ 
+ =back
+ 
  =head2 Subtasks of doing an installation
  
***************
*** 668,671 ****
--- 684,688 ----
        die getmessage('PerlVersionFailure', ['5.6.1']);
      }
+       startsysout();
  
      my @missing = ();
***************
*** 702,705 ****
--- 719,723 ----
  
  
+       startsysout();
      unless (-x "/usr/bin/perl") {
        my $realperl=`which perl`;
***************
*** 711,714 ****
--- 729,733 ----
        my $response=showmessage(getmessage('ConfirmPerlExecutableSymlink', 
$realperl), 'yn', 'y', 1);
        unless ($response eq 'n') {
+               startsysout();
            system("ln -s $realperl /usr/bin/perl");
        }
***************
*** 732,736 ****
  : |;
  
! $messages->{'DirFailed'}->{en} = qq|
  We could not create %s, but continuing anyway...
  
--- 751,755 ----
  : |;
  
! $messages->{'DirFailed'}->{en} = RED.qq|
  We could not create %s, but continuing anyway...
  
***************
*** 782,787 ****
      # FIXME: Need better error handling for all mkdir calls here
      unless ( -d $intranetdir ) {
!        mkdir_parents (dirname($intranetdir), 0775) || print 
getmessage('DirFailed','parents of '.$intranetdir);
!        mkdir ($intranetdir,                  0770) || print 
getmessage('DirFailed',$intranetdir);
         if ($>==0) { chown (oct(0), (getgrnam($httpduser))[2], 
"$intranetdir"); }
         chmod 0770, "$intranetdir";
--- 801,806 ----
      # FIXME: Need better error handling for all mkdir calls here
      unless ( -d $intranetdir ) {
!        mkdir_parents (dirname($intranetdir), 0775) || print 
getmessage('DirFailed',['parents of '.$intranetdir]);
!        mkdir ($intranetdir,                  0770) || print 
getmessage('DirFailed',[$intranetdir]);
         if ($>==0) { chown (oct(0), (getgrnam($httpduser))[2], 
"$intranetdir"); }
         chmod 0770, "$intranetdir";
***************
*** 792,797 ****
      mkdir_parents ("$intranetdir/scripts",   0750);
      unless ( -d $opacdir ) {
!        mkdir_parents (dirname($opacdir),     0775) || print 
getmessage('DirFailed','parents of '.$opacdir);
!        mkdir ($opacdir,                      0770) || print 
getmessage('DirFailed',$opacdir);
         if ($>==0) { chown (oct(0), (getgrnam($httpduser))[2], "$opacdir"); }
         chmod (oct(770), "$opacdir");
--- 811,816 ----
      mkdir_parents ("$intranetdir/scripts",   0750);
      unless ( -d $opacdir ) {
!        mkdir_parents (dirname($opacdir),     0775) || print 
getmessage('DirFailed',['parents of '.$opacdir]);
!        mkdir ($opacdir,                      0770) || print 
getmessage('DirFailed',[$opacdir]);
         if ($>==0) { chown (oct(0), (getgrnam($httpduser))[2], "$opacdir"); }
         chmod (oct(770), "$opacdir");
***************
*** 802,807 ****
  
      unless ( -d $kohalogdir ) {
!        mkdir_parents (dirname($kohalogdir),  0775) || print 
getmessage('DirFailed','parents of '.$kohalogdir);
!        mkdir ($kohalogdir,                   0770) || print 
getmessage('DirFailed',$kohalogdir);
         if ($>==0) { chown (oct(0), (getgrnam($httpduser))[2,3], 
"$kohalogdir"); }
         chmod (oct(770), "$kohalogdir");
--- 821,826 ----
  
      unless ( -d $kohalogdir ) {
!        mkdir_parents (dirname($kohalogdir),  0775) || print 
getmessage('DirFailed',['parents of '.$kohalogdir]);
!        mkdir ($kohalogdir,                   0770) || print 
getmessage('DirFailed',[$kohalogdir]);
         if ($>==0) { chown (oct(0), (getgrnam($httpduser))[2,3], 
"$kohalogdir"); }
         chmod (oct(770), "$kohalogdir");
***************
*** 987,991 ****
      }
      unless (open (HTTPDCONF, "<$realhttpdconf")) {
!       warn "Insufficient privileges to open $realhttpdconf for reading.\n";
        sleep 4;
      }
--- 1006,1010 ----
      }
      unless (open (HTTPDCONF, "<$realhttpdconf")) {
!       warn RED."Insufficient privileges to open $realhttpdconf for 
reading.\n";
        sleep 4;
      }
***************
*** 998,1007 ****
      close(HTTPDCONF);
  
! 
! 
! 
!     unless ($httpduser) {
        my $message=getmessage('EnterApacheUser', [$etcdir]);
!       until (length($httpduser) && getpwnam($httpduser)) {
            $httpduser=showmessage($message, "free", '');
            if (length($httpduser)>0) {
--- 1017,1023 ----
      close(HTTPDCONF);
  
!     unless (defined($httpduser)) {
        my $message=getmessage('EnterApacheUser', [$etcdir]);
!       until (defined($httpduser) && length($httpduser) && 
getpwnam($httpduser)) {
            $httpduser=showmessage($message, "free", '');
            if (length($httpduser)>0) {
***************
*** 1013,1017 ****
            }
        }
-       print "AU: $httpduser\n";
      }
  }
--- 1029,1032 ----
***************
*** 1165,1168 ****
--- 1180,1184 ----
      }
  
+       startsysout;
      if (`grep 'VirtualHost $servername' "$httpdconf"`) {
        showmessage(getmessage('ApacheAlreadyConfigured', [$httpdconf, 
$httpdconf]), 'PressEnter');
***************
*** 1335,1342 ****
--- 1351,1360 ----
                if (-d $tgt) {
                print getmessage('CopyingFiles', ["old ".$desc,$tgt.".old"]);
+                       startsysout;
                        system("mv ".$tgt." ".$tgt.".old");
                }
  
        print getmessage('CopyingFiles', [$desc,$tgt]);
+       startsysout;
            system("cp -R ".$src." ".$tgt);
        }
***************
*** 1350,1353 ****
--- 1368,1372 ----
      neatcopy("OPAC templates", 'opac-html', "$opacdir/htdocs");
      neatcopy("OPAC interface", 'opac-cgi', "$opacdir/cgi-bin");
+       startsysout();
      system("touch $opacdir/cgi-bin/opac");
  
***************
*** 1379,1382 ****
--- 1398,1402 ----
      umask($old_umask);
  
+       startsysout();
        #MJR: can't help but this be broken, can we?
      chmod 0440, "$etcdir/koha.conf.tmp";
***************
*** 1490,1493 ****
--- 1510,1514 ----
        setmysqlclipass($mysqlpass);
        # 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 
('%','$dbname','$user','Y','Y','Y','Y','Y','Y','Y','Y')\"");
***************
*** 1500,1503 ****
--- 1521,1525 ----
        } else {
                # Create the database structure
+               startsysout();
                system("$mysqldir/bin/mysql -u$user $dbname < koha.mysql");
        }
***************
*** 1566,1569 ****
--- 1588,1592 ----
        my $response=showmessage(getmessage('UpdateMarcTables'), 'restrictchar 
12N', '1');
  
+       startsysout();
        if ($response eq '1') {
                system("cat scripts/misc/marc_datas/marc21_en/structure_def.sql 
| $mysqldir/bin/mysql -u$user $dbname");
***************
*** 1582,1586 ****
        delete($ENV{"KOHA_CONF"});
  
!       print "\n\nFinished updating of database. Press <ENTER> to continue...";
        <STDIN>;
  }
--- 1605,1609 ----
        delete($ENV{"KOHA_CONF"});
  
!       print RESET."\n\nFinished updating of database. Press <ENTER> to 
continue...";
        <STDIN>;
  }
***************
*** 1628,1631 ****
--- 1651,1655 ----
                $branchcode or $branchcode='DEF';
  
+               startsysout();
                system("$mysqldir/bin/mysql -u$user $dbname -e \"insert into 
branches (branchcode,branchname,issuing) values ('$branchcode', '$branch', 
1)\"");
                system("$mysqldir/bin/mysql -u$user $dbname -e \"insert into 
branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\"");
***************
*** 1673,1676 ****
--- 1697,1701 ----
  
      unless ($response=~/^n/i) {
+       startsysout();
        # Need to support other init structures here?
        if (-e "/etc/rc.d/init.d/httpd") {

Index: installer.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/installer.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** installer.pl        20 May 2003 19:50:17 -0000      1.14
--- installer.pl        9 Jul 2003 00:16:22 -0000       1.15
***************
*** 22,25 ****
--- 22,28 ----
        close INPUT;
     }
+    elsif (open(INPUT, "</etc/hostname")) {
+       $domainname = <INPUT>;
+    }
  }
  Install::setdomainname $domainname;