You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xindice-dev@xml.apache.org by br...@apache.org on 2001/12/07 07:05:19 UTC

cvs commit: xml-xindice/bin .cmdwrapper

bradford    01/12/06 22:05:19

  Modified:    .        start xindice.server
               bin      .cmdwrapper
  Log:
  Modified shell scripts to ensure proper test -z results on Solaris and to
  use XINDICE_HOME whenever possible
  
  Revision  Changes    Path
  1.2       +1 -1      xml-xindice/start
  
  Index: start
  ===================================================================
  RCS file: /home/cvs/xml-xindice/start,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- start	2001/12/06 19:33:45	1.1
  +++ start	2001/12/07 06:05:18	1.2
  @@ -1,5 +1,5 @@
   #!/bin/sh
  -if test -z $XINDICE_HOME; then
  +if test -z "$XINDICE_HOME"; then
      XINDICE_HOME=`dirname $0`
      export XINDICE_HOME
   fi
  
  
  
  1.2       +11 -7     xml-xindice/xindice.server
  
  Index: xindice.server
  ===================================================================
  RCS file: /home/cvs/xml-xindice/xindice.server,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- xindice.server	2001/12/06 19:33:45	1.1
  +++ xindice.server	2001/12/07 06:05:18	1.2
  @@ -4,27 +4,31 @@
   # You're going to have to modify the following variables
   # based on your installation locations.
   
  -# $Id: xindice.server,v 1.1 2001/12/06 19:33:45 bradford Exp $
  +# $Id: xindice.server,v 1.2 2001/12/07 06:05:18 bradford Exp $
   
  -BASEDIR=/home/tom/work/Xindice
  -BINDIR=$BASEDIR/bin
  +if test -z "$XINDICE_HOME"; then
  +   XINDICE_HOME=`dirname $0`
  +   export XINDICE_HOME
  +fi
  +
  +BINDIR=$XINDICE_HOME/bin
   JAVA_HOME=/usr/local/java
   PATH=$PATH:$JAVA_HOME/bin:$BINDIR:/usr/bin:/usr/sbin
  -PIDFILE=$BASEDIR/config/xindice.pid
  +PIDFILE=$XINDICE_HOME/config/xindice.pid
   
   export PATH JAVA_HOME
   
  -cd $BASEDIR
  +cd $XINDICE_HOME
   
   MODE=$1
   case "$MODE" in
   
      'start')
  -      if test -x $BASEDIR/start
  +      if test -x $XINDICE_HOME/start
         then
            exec ./start 1> /dev/null 2> /dev/null &
         else
  -         echo "Can't execute $BASEDIR/start"
  +         echo "Can't execute $XINDICE_HOME/start"
         fi
         ;;
   
  
  
  
  1.2       +1 -1      xml-xindice/bin/.cmdwrapper
  
  Index: .cmdwrapper
  ===================================================================
  RCS file: /home/cvs/xml-xindice/bin/.cmdwrapper,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- .cmdwrapper	2001/12/06 19:33:45	1.1
  +++ .cmdwrapper	2001/12/07 06:05:19	1.2
  @@ -1,6 +1,6 @@
   #!/bin/sh
   
  -if test -z $XINDICE_HOME; then
  +if test -z "$XINDICE_HOME"; then
      echo "\$XINDICE_HOME Is Not Set"
      exit
   fi