[Koha-cvs] CVS: koha installer.pl,1.2.2.41,1.2.2.42 buildrelease,1.1.2.7,1.1.2.8

[Steve Tonnesen]

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

Modified Files:
      Tag: rel-1-2
        installer.pl buildrelease 
Log Message:
moved z3950 scripts to z3950daemon subdir within scripts dir in tarball


Index: installer.pl
===================================================================
RCS file: /cvsroot/koha/koha/installer.pl,v
retrieving revision 1.2.2.41
retrieving revision 1.2.2.42
diff -C2 -r1.2.2.41 -r1.2.2.42
*** installer.pl        26 Jun 2002 18:57:02 -0000      1.2.2.41
--- installer.pl        26 Jun 2002 20:00:19 -0000      1.2.2.42
***************
*** 519,522 ****
--- 519,526 ----
     mkdir ("$kohadir/modules", oct(750));
  }
+ unless ( -d "$kohadir/scripts" ) {
+    print "Creating $kohadir/scripts...\n";
+    mkdir ("$kohadir/scripts", oct(750));
+ }
  unless ( -d $opacdir ) {
     print "Creating $opacdir...\n";
***************
*** 552,556 ****
  print "Copying intranet-cgi files to $kohadir/cgi-bin...\n";
  system("cp -R intranet-cgi/* $kohadir/cgi-bin/");
! print "Copying script files to $kohadir/modules...\n";
  system("cp -R modules/* $kohadir/modules/");
  print "Copying opac-html files to $opacdir/htdocs...\n";
--- 556,562 ----
  print "Copying intranet-cgi files to $kohadir/cgi-bin...\n";
  system("cp -R intranet-cgi/* $kohadir/cgi-bin/");
! print "Copying script files to $kohadir/scripts...\n";
! system("cp -R scripts/* $kohadir/scripts/");
! print "Copying module files to $kohadir/modules...\n";
  system("cp -R modules/* $kohadir/modules/");
  print "Copying opac-html files to $opacdir/htdocs...\n";
***************
*** 705,709 ****
  |;
  
! my $kohalog='/var/log/koha';
  print "Directory for logging by Z39.50 daemon [$kohalogdir]: ";
  chomp($input = <STDIN>);
--- 711,715 ----
  |;
  
! my $kohalogdir='/var/log/koha';
  print "Directory for logging by Z39.50 daemon [$kohalogdir]: ";
  chomp($input = <STDIN>);
***************
*** 729,739 ****
  
  # LAUNCH SCRIPT
  my $newfile='';
! open (L, "scripts/z3950-daemon-launch.sh");
  while (<L>) {
      if (/^RunAsUser=/) {
        $newfile.="RunAsUser=$httpduser\n";
      } elsif (/^KohaZ3950Dir=/) {
!       $newfile.="KohaZ3950Dir=$kohadir/scripts/\n";
      } else {
        $newfile.=$_;
--- 735,746 ----
  
  # LAUNCH SCRIPT
+ print "Modifying Z39.50 daemon launch script...\n";
  my $newfile='';
! open (L, "$kohadir/scripts/z3950daemon/z3950-daemon-launch.sh");
  while (<L>) {
      if (/^RunAsUser=/) {
        $newfile.="RunAsUser=$httpduser\n";
      } elsif (/^KohaZ3950Dir=/) {
!       $newfile.="KohaZ3950Dir=$kohadir/scripts/z3950daemon\n";
      } else {
        $newfile.=$_;
***************
*** 741,757 ****
  }
  close L;
! system("mv scripts/z3950-daemon-launch.sh z3950-daemon-launch.sh.orig");
! open L, ">scripts/z3950-daemon-launch.sh";
  print L $newfile;
  close L;
  
  # SHELL SCRIPT
  $newfile='';
! open (S, "scripts/z3950-daemon-shell.sh");
  while (<S>) {
      if (/^KohaModuleDir=/) {
        $newfile.="KohaModuleDir=$kohadir/modules\n";
      } elsif (/^KohaZ3950Dir=/) {
!       $newfile.="KohaZ3950Dir=$kohadir/scripts\n";
      } elsif (/^LogDir=/) {
        $newfile.="LogDir=$kohalogdir\n";
--- 748,766 ----
  }
  close L;
! system("mv $kohadir/scripts/z3950daemon/z3950-daemon-launch.sh 
$kohadir/scripts/z3950daemon/z3950-daemon-launch.sh.orig");
! open L, ">$kohadir/scripts/z3950daemon/z3950-daemon-launch.sh";
  print L $newfile;
  close L;
  
+ 
  # SHELL SCRIPT
+ print "Modifying Z39.50 daemon wrapper script...\n";
  $newfile='';
! open (S, "$kohadir/scripts/z3950daemon/z3950-daemon-shell.sh");
  while (<S>) {
      if (/^KohaModuleDir=/) {
        $newfile.="KohaModuleDir=$kohadir/modules\n";
      } elsif (/^KohaZ3950Dir=/) {
!       $newfile.="KohaZ3950Dir=$kohadir/scripts/z3950daemon\n";
      } elsif (/^LogDir=/) {
        $newfile.="LogDir=$kohalogdir\n";
***************
*** 762,769 ****
  close S;
  
! system("mv scripts/z3950-daemon-shell.sh z3950-daemon-shell.sh.orig");
! open S, ">scripts/z3950-daemon-shell.sh";
  print S $newfile;
  close S;
  
  
--- 771,783 ----
  close S;
  
! system("mv $kohadir/scripts/z3950daemon/z3950-daemon-shell.sh 
$kohadir/scripts/z3950daemon/z3950-daemon-shell.sh.orig");
! open S, ">$kohadir/scripts/z3950daemon/z3950-daemon-shell.sh";
  print S $newfile;
  close S;
+ chmod 0750, "$kohadir/scripts/z3950daemon/z3950-daemon-launch.sh";
+ chmod 0750, "$kohadir/scripts/z3950daemon/z3950-daemon-shell.sh";
+ chmod 0750, "$kohadir/scripts/z3950daemon/processz3950queue";
+ chown(0, (getpwnam($httpduser)) [3], 
"$kohadir/scripts/z3950daemon/z3950-daemon-shell.sh") or warn "can't chown 
$kohadir/scripts/z3950daemon/z3950-daemon-shell.sh: $!";
+ chown(0, (getpwnam($httpduser)) [3], 
"$kohadir/scripts/z3950daemon/processz3950queue") or warn "can't chown 
$kohadir/scripts/z3950daemon/processz3950queue: $!";
  
  

Index: buildrelease
===================================================================
RCS file: /cvsroot/koha/koha/Attic/buildrelease,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -C2 -r1.1.2.7 -r1.1.2.8
*** buildrelease        26 Jun 2002 18:57:02 -0000      1.1.2.7
--- buildrelease        26 Jun 2002 20:00:19 -0000      1.1.2.8
***************
*** 180,183 ****
--- 180,184 ----
  mkdir("opac-html", 0755);
  mkdir("scripts", 0755);
+ mkdir("scripts/z3950daemon", 0755);
  mkdir("modules", 0755);
  mkdir("docs", 0755);
***************
*** 216,222 ****
  system("mv $rootdir/intranet-cgi/updater $rootdir/scripts");
  system("mv $rootdir/intranet-cgi/misc $rootdir/scripts");
! system("mv $rootdir/intranet-cgi/acqui.simple/processz3950queue 
$rootdir/scripts");
! system("mv $rootdir/intranet-cgi/acqui.simple/z3950-daemon-launch.sh 
$rootdir/scripts");
! system("mv $rootdir/intranet-cgi/acqui.simple/z3950-daemon-shell.sh 
$rootdir/scripts");
  
  
--- 217,223 ----
  system("mv $rootdir/intranet-cgi/updater $rootdir/scripts");
  system("mv $rootdir/intranet-cgi/misc $rootdir/scripts");
! system("mv $rootdir/intranet-cgi/acqui.simple/processz3950queue 
$rootdir/scripts/z3950daemon/");
! system("mv $rootdir/intranet-cgi/acqui.simple/z3950-daemon-launch.sh 
$rootdir/scripts/z3950daemon/");
! system("mv $rootdir/intranet-cgi/acqui.simple/z3950-daemon-shell.sh 
$rootdir/scripts/z3950daemon/");