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

[Steve Tonnesen]

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

Modified Files:
      Tag: rel-1-2
	z3950-daemon-launch.sh z3950-daemon-shell.sh 
Log Message:
shell scripts now parse the config file to get working directories and apache
userid


Index: z3950-daemon-launch.sh
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/z3950-daemon-launch.sh,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** z3950-daemon-launch.sh	26 Jun 2002 19:56:57 -0000	1.1.2.3
--- z3950-daemon-launch.sh	25 Jul 2002 17:34:02 -0000	1.1.2.4
***************
*** 14,22 ****
  #   Needs SysV-type start/stop options
  
  #----------------------------
  # User ID to run the daemon as.  Don't use "root"
! RunAsUser=apache
  
! KohaZ3950Dir=/usr/local/www/koha/htdocs/cgi-bin/koha/acqui.simple
  export KohaZ3950Dir
  
--- 14,42 ----
  #   Needs SysV-type start/stop options
  
+ 
+ # Parse /etc/koha.conf
+ for line in `cat /etc/koha.conf` ; do
+     OIFS=$IFS
+     IFS='='
+     set -- $line
+     if [ $1 = 'intranetdir' ] ; then
+ 	intranetdir=$2
+     fi
+     if [ $1 = 'httpduser' ] ; then
+ 	httpduser=$2
+     fi
+     if [ $1 = 'kohalogdir' ] ; then
+ 	kohalogdir=$2
+     fi
+     IFS=$OIFS
+ done
+ 
+ 
+ 
  #----------------------------
  # User ID to run the daemon as.  Don't use "root"
! RunAsUser=$httpduser
  
! KohaZ3950Dir=$intranetdir/scripts/z3950daemon
  export KohaZ3950Dir
  
***************
*** 42,45 ****
--- 62,69 ----
  #--------------
  # $Log$
+ # Revision 1.1.2.4  2002/07/25 17:34:02  tonnesen
+ # shell scripts now parse the config file to get working directories and apache
+ # userid
+ #
  # Revision 1.1.2.3  2002/06/26 19:56:57  tonnesen
  # Bug fix.  Single quotes were causing $KohaZ3950Shell variable to not get

Index: z3950-daemon-shell.sh
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/z3950-daemon-shell.sh,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** z3950-daemon-shell.sh	28 Jun 2002 17:45:39 -0000	1.1.2.3
--- z3950-daemon-shell.sh	25 Jul 2002 17:34:02 -0000	1.1.2.4
***************
*** 14,20 ****
  #----------------------------
  
! KohaZ3950Dir=/usr/local/www/koha/htdocs/cgi-bin/koha/acqui.simple
! KohaModuleDir=/usr/local/koha/modules
! LogDir=/var/log/koha
  
  #----------------------------
--- 14,42 ----
  #----------------------------
  
! 
! # Parse /etc/koha.conf
! for line in `cat /etc/koha.conf` ; do
!     OIFS=$IFS
!     IFS='='
!     set -- $line
!     if [ $1 = 'intranetdir' ] ; then
! 	intranetdir=$2
!     fi
!     if [ $1 = 'httpduser' ] ; then
! 	httpduser=$2
!     fi
!     if [ $1 = 'kohalogdir' ] ; then
! 	kohalogdir=$2
!     fi
!     IFS=$OIFS
! done
! 
! 
! 
! 
! 
! KohaZ3950Dir=$intranetdir/scripts/z3950daemon
! KohaModuleDir=$intranetdir/modules
! LogDir=$kohalogdir
  
  #----------------------------
***************
*** 42,45 ****
--- 64,71 ----
  #-------------------
  # $Log$
+ # Revision 1.1.2.4  2002/07/25 17:34:02  tonnesen
+ # shell scripts now parse the config file to get working directories and apache
+ # userid
+ #
  # Revision 1.1.2.3  2002/06/28 17:45:39  tonnesen
  # z3950queue now listens for a -HUP signal before processing the queue.  Z3950.pm