[Koha-cvs] CVS: koha buildrelease,1.1.2.6,1.1.2.7 installer.pl,1.2.2.40,1.2.2.41

[Steve Tonnesen]

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

Modified Files:
      Tag: rel-1-2
        buildrelease installer.pl 
Log Message:
Fixed hard coded directories in z3950 shell scripts, and moved z3950 scripts to
scripts directory in tarball.


Index: buildrelease
===================================================================
RCS file: /cvsroot/koha/koha/Attic/buildrelease,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -r1.1.2.6 -r1.1.2.7
*** buildrelease        25 Jun 2002 21:58:53 -0000      1.1.2.6
--- buildrelease        26 Jun 2002 18:57:02 -0000      1.1.2.7
***************
*** 216,219 ****
--- 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");
  
  

Index: installer.pl
===================================================================
RCS file: /cvsroot/koha/koha/installer.pl,v
retrieving revision 1.2.2.40
retrieving revision 1.2.2.41
diff -C2 -r1.2.2.40 -r1.2.2.41
*** installer.pl        26 Jun 2002 18:19:06 -0000      1.2.2.40
--- installer.pl        26 Jun 2002 18:57:02 -0000      1.2.2.41
***************
*** 699,702 ****
--- 699,771 ----
  
  
+ print qq|
+ 
+ SETTING UP Z39.50 DAEMON
+ ========================
+ |;
+ 
+ my $kohalog='/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);
+           }
+       }
+     }
+ }
+ chmod 0770, $kohalogdir;
+ chown((getpwnam($httpduser)) [2,3], $kohalogdir) or warn "can't chown 
$kohalogdir: $!";
+ 
+ # 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.=$_;
+     }
+ }
+ 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";
+     } else {
+       $newfile.=$_;
+     }
+ }
+ 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;
+ 
+ 
  #RESTART APACHE
  print "\n\n";