[Koha-cvs] CVS: koha/acqui.simple z3950-daemon-launch.sh,1.1.2.1,1.1.2.2 z3950-daemon-shell.sh,1.1.2.1,1.1.2.2

[Alan Millar]

Update of /cvsroot/koha/koha/acqui.simple
In directory usw-pr-cvs1:/tmp/cvs-serv29835

Modified Files:
      Tag: rel-1-2
        z3950-daemon-launch.sh z3950-daemon-shell.sh 
Log Message:
Make directory variable name more explanatory

Index: z3950-daemon-launch.sh
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/z3950-daemon-launch.sh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** z3950-daemon-launch.sh      11 Jun 2002 06:26:57 -0000      1.1.2.1
--- z3950-daemon-launch.sh      26 Jun 2002 16:25:51 -0000      1.1.2.2
***************
*** 1,4 ****
--- 1,6 ----
  #!/bin/sh
  
+ # $Id$
+ 
  # Script to start Koha background Z39.50 search daemon
  
***************
*** 16,30 ****
  RunAsUser=apache
  
! KohaDir=/usr/local/www/koha/htdocs/cgi-bin/koha/acqui.simple
! export KohaDir
  
  #----------------------------
! if [ ! -d $KohaDir ]
  then
!       echo ERROR: Cannot find Koha directory $KohaDir
        exit 1
  fi
  
! KohaZ3950Shell=$KohaDir/z3950-daemon-shell.sh
  
  if [ ! -x $KohaZ3950Shell ]
--- 18,32 ----
  RunAsUser=apache
  
! KohaZ3950Dir=/usr/local/www/koha/htdocs/cgi-bin/koha/acqui.simple
! export KohaZ3950Dir
  
  #----------------------------
! if [ ! -d $KohaZ3950Dir ]
  then
!       echo ERROR: Cannot find Koha directory $KohaZ3950Dir
        exit 1
  fi
  
! KohaZ3950Shell=$KohaZ3950Dir/z3950-daemon-shell.sh
  
  if [ ! -x $KohaZ3950Shell ]
***************
*** 35,36 ****
--- 37,46 ----
  
  su -s /bin/sh -c '$KohaZ3950Shell &' - $RunAsUser &
+ 
+ exit
+ 
+ #--------------
+ # $Log$
+ # Revision 1.1.2.2  2002/06/26 16:25:51  amillar
+ # Make directory variable name more explanatory
+ #

Index: z3950-daemon-shell.sh
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/z3950-daemon-shell.sh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** z3950-daemon-shell.sh       11 Jun 2002 06:26:57 -0000      1.1.2.1
--- z3950-daemon-shell.sh       26 Jun 2002 16:25:51 -0000      1.1.2.2
***************
*** 1,4 ****
--- 1,6 ----
  #!/bin/sh
  
+ # $Id$
+ 
  # Script to start Koha background Z39.50 search daemon
  
***************
*** 7,16 ****
  
  #----------------------------
! # Do NOT run this script directly from system startup-
  #    Call  z3950-daemon-launch.sh  instead
  
  #----------------------------
  
! KohaDir=/usr/local/www/koha/htdocs/cgi-bin/koha/acqui.simple
  KohaModuleDir=/usr/local/koha/modules
  LogDir=/var/log/koha
--- 9,18 ----
  
  #----------------------------
! # Do NOT run this script directly from system startup-- this should not run 
as root
  #    Call  z3950-daemon-launch.sh  instead
  
  #----------------------------
  
! KohaZ3950Dir=/usr/local/www/koha/htdocs/cgi-bin/koha/acqui.simple
  KohaModuleDir=/usr/local/koha/modules
  LogDir=/var/log/koha
***************
*** 26,30 ****
  fi
  
! KohaZ3950Script=$KohaDir/processz3950queue
  if [ ! -x $KohaZ3950Script ]
  then
--- 28,32 ----
  fi
  
! KohaZ3950Script=$KohaZ3950Dir/processz3950queue
  if [ ! -x $KohaZ3950Script ]
  then
***************
*** 36,38 ****
  export PERL5LIB
  
! exec $KohaDir/processz3950queue >>$LOGFILE 2>&1
--- 38,46 ----
  export PERL5LIB
  
! exec $KohaZ3950Script >>$LOGFILE 2>&1
! 
! #-------------------
! # $Log$
! # Revision 1.1.2.2  2002/06/26 16:25:51  amillar
! # Make directory variable name more explanatory
! #