Changeset 4160


Ignore:
Timestamp:
07/03/08 08:02:31 (12 years ago)
Author:
melissa
Message:

Check the script's directory (not the working directory) for loci_tools.jar

Location:
trunk/tools
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/bfconvert

    r3138 r4160  
    1313 
    1414PROG=loci.formats.tools.ImageConverter 
     15DIR=`dirname $0` 
    1516 
    1617if [ $LOCI_DEVEL ] 
    1718then 
    1819  java -mx512m $PROG "$@" 
    19 elif [ -e loci_tools.jar ] || [ -e bio-formats.jar ] 
     20elif [ -e $DIR/loci_tools.jar ] || [ -e $DIR/bio-formats.jar ] 
    2021then 
    21   java -mx512m -cp bio-formats.jar:loci_tools.jar $PROG "$@" 
     22  java -mx512m -cp $DIR/bio-formats.jar:$DIR/loci_tools.jar $PROG "$@" 
    2223else 
    2324  echo "Required JAR libraries not found. Please download:" 
  • trunk/tools/bfview

    r2540 r4160  
    1313 
    1414PROG=loci.formats.gui.ImageViewer 
     15DIR=`dirname $0` 
    1516 
    1617if [ $LOCI_DEVEL ] 
    1718then 
    1819  java -mx512m $PROG "$@" 
    19 elif [ -e loci_tools.jar ] || [ -e bio-formats.jar ] 
     20elif [ -e $DIR/loci_tools.jar ] || [ -e $DIR/bio-formats.jar ] 
    2021then 
    21   java -mx512m -cp bio-formats.jar:loci_tools.jar $PROG "$@" 
     22  java -mx512m -cp $DIR/bio-formats.jar:$DIR/loci_tools.jar $PROG "$@" 
    2223else 
    2324  echo "Required JAR libraries not found. Please download:" 
  • trunk/tools/editor

    r2766 r4160  
    1313 
    1414PROG=loci.ome.editor.MetadataEditor 
     15DIR=`dirname $0` 
    1516 
    1617if [ $LOCI_DEVEL ] 
    1718then 
    1819  java -mx512m $PROG "$@" 
    19 elif [ -e loci_tools.jar ] || [ -e bio-formats.jar ] 
     20elif [ -e $DIR/loci_tools.jar ] || [ -e $DIR/bio-formats.jar ] 
    2021then 
    21   java -mx512m -cp bio-formats.jar:loci_tools.jar $PROG "$@" 
     22  java -mx512m -cp $DIR/bio-formats.jar:$DIR/loci_tools.jar $PROG "$@" 
    2223else 
    2324  echo "Required JAR libraries not found. Please download:" 
  • trunk/tools/ijview

    r3138 r4160  
    1414 
    1515PROG=loci.plugins.Importer 
     16DIR=`dirname $0` 
    1617 
    1718if [ $LOCI_DEVEL ] 
    1819then 
    1920  java -mx512m $PROG "$@" 
    20 elif [ -e loci_tools.jar -a ij.jar ] || [ -e bio-formats.jar -a ij.jar ] 
     21elif [ -e $DIR/loci_tools.jar ] || [ -e $DIR/bio-formats.jar ] 
    2122then 
    22   java -mx512m -cp bio-formats.jar:ij.jar:loci_tools.jar $PROG "$@" 
     23  java -mx512m -cp $DIR/bio-formats.jar:$DIR/loci_tools.jar $PROG "$@" 
    2324else 
    2425  echo "Required JAR libraries not found. Please download:" 
  • trunk/tools/notes

    r2766 r4160  
    1313 
    1414PROG=loci.ome.notes.Notes 
     15DIR=`dirname $0` 
    1516 
    1617if [ $LOCI_DEVEL ] 
    1718then 
    1819  java -mx512m $PROG "$@" 
    19 elif [ -e loci_tools.jar ] || [ -e bio-formats.jar ] 
     20elif [ -e $DIR/loci_tools.jar ] || [ -e $DIR/bio-formats.jar ] 
    2021then 
    21   java -mx512m -cp bio-formats.jar:loci_tools.jar $PROG "$@" 
     22  java -mx512m -cp $DIR/bio-formats.jar:$DIR/loci_tools.jar $PROG "$@" 
    2223else 
    2324  echo "Required JAR libraries not found. Please download:" 
  • trunk/tools/omeul

    r2791 r4160  
    1313 
    1414PROG=loci.formats.ome.OMEWriter 
     15DIR=`dirname $0` 
    1516 
    1617if [ $LOCI_DEVEL ] 
    1718then 
    1819  java -mx512m $PROG "$@" 
    19 elif [ -e loci_tools.jar ] || [ -e bio-formats.jar ] 
     20elif [ -e $DIR/loci_tools.jar ] || [ -e $DIR/bio-formats.jar ] 
    2021then 
    21   java -mx512m -cp bio-formats.jar:loci_tools.jar $PROG "$@" 
     22  java -mx512m -cp $DIR/bio-formats.jar:$DIR/loci_tools.jar $PROG "$@" 
    2223else 
    2324  echo "Required JAR libraries not found. Please download:" 
  • trunk/tools/showinf

    r3138 r4160  
    1414 
    1515PROG=loci.formats.tools.ImageInfo 
     16DIR=`dirname $0` 
    1617 
    1718if [ $LOCI_DEVEL ] 
    1819then 
    1920  java -mx512m $PROG "$@" 
    20 elif [ -e loci_tools.jar ] || [ -e bio-formats.jar ] 
     21elif [ -e $DIR/loci_tools.jar ] || [ -e $DIR/bio-formats.jar ] 
    2122then 
    22   java -mx512m -cp bio-formats.jar:loci_tools.jar $PROG "$@" 
     23  java -mx512m -cp $DIR/bio-formats.jar:$DIR/loci_tools.jar $PROG "$@" 
    2324else 
    2425  echo "Required JAR libraries not found. Please download:" 
  • trunk/tools/tiffcomment

    r3474 r4160  
    1414 
    1515PROG=loci.formats.tools.TiffComment 
     16DIR=`dirname $0` 
    1617 
    1718if [ $LOCI_DEVEL ] 
    1819then 
    1920  java -mx512m $PROG "$@" 
    20 elif [ -e loci_tools.jar ] || [ -e bio-formats.jar ] 
     21elif [ -e $DIR/loci_tools.jar ] || [ -e $DIR/bio-formats.jar ] 
    2122then 
    22   java -mx512m -cp bio-formats.jar:loci_tools.jar $PROG "$@" 
     23  java -mx512m -cp $DIR/bio-formats.jar:$DIR/loci_tools.jar $PROG "$@" 
    2324else 
    2425  echo "Required JAR libraries not found. Please download:" 
  • trunk/tools/xmlindent

    r3144 r4160  
    1313 
    1414PROG=loci.formats.tools.XMLIndent 
     15DIR=`dirname $0` 
    1516 
    1617if [ $LOCI_DEVEL ] 
    1718then 
    1819  java -mx512m $PROG "$@" 
    19 elif [ -e loci_tools.jar ] || [ -e bio-formats.jar ] 
     20elif [ -e $DIR/loci_tools.jar ] || [ -e $DIR/bio-formats.jar ] 
    2021then 
    21   java -mx512m -cp bio-formats.jar:loci_tools.jar $PROG "$@" 
     22  java -mx512m -cp $DIR/bio-formats.jar:$DIR/loci_tools.jar $PROG "$@" 
    2223else 
    2324  echo "Required JAR libraries not found. Please download:" 
  • trunk/tools/xmlvalid

    r3145 r4160  
    1313 
    1414PROG=loci.formats.tools.XMLValidate 
     15DIR=`dirname $0` 
    1516 
    1617if [ $LOCI_DEVEL ] 
    1718then 
    1819  java -mx512m $PROG "$@" 
    19 elif [ -e loci_tools.jar ] || [ -e bio-formats.jar ] 
     20elif [ -e $DIR/loci_tools.jar ] || [ -e $DIR/bio-formats.jar ] 
    2021then 
    21   java -mx512m -cp bio-formats.jar:loci_tools.jar $PROG "$@" 
     22  java -mx512m -cp $DIR/bio-formats.jar:$DIR/loci_tools.jar $PROG "$@" 
    2223else 
    2324  echo "Required JAR libraries not found. Please download:" 
Note: See TracChangeset for help on using the changeset viewer.