[Javapathfinder-devel] javapathfinder/bin jpf,1.3,1.4

[pcm <pcm...@us...>]

Update of /cvsroot/javapathfinder/javapathfinder/bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23396

Modified Files:
	jpf 
Log Message:
Masouds cygwin script fixes

Index: jpf
===================================================================
RCS file: /cvsroot/javapathfinder/javapathfinder/bin/jpf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- jpf	1 May 2005 04:09:21 -0000	1.3
+++ jpf	10 May 2005 23:20:37 -0000	1.4
@@ -16,12 +16,12 @@
 
 #add (recursively) any *.jar or *.zip that's under $JPF_HOME/lib
 #note that those take precedence over what already is in the classpath
-if test -d $JPF_HOME/lib; then
-  CP=$CP:`find $JPF_HOME/lib \( -name "*.jar" -or -name "*.zip" \) -exec echo -n {}":" \;`
+if test -d "$JPF_HOME/lib"; then
+  CP=$CP:`find "$JPF_HOME"/lib \( -name "*.jar" -or -name "*.zip" \) -exec echo -n {}":" \;`
 fi
 
-if test -d $JPF_HOME/extensions; then
-  CP=$CP:`find $JPF_HOME/extensions \( -name "*.jar" -or -name "*.zip" \) -exec echo -n {}":" \;`
+if test -d "$JPF_HOME/extensions"; then
+  CP=$CP:`find "$JPF_HOME"/extensions \( -name "*.jar" -or -name "*.zip" \) -exec echo -n {}":" \;`
 fi
 
 #our standard native peer environment (just the peer, NOT the model classes)
@@ -41,19 +41,19 @@
 fi
 
 #now check if we find our mandatory jars
-if test ! `expr $CP : ".*\(bcel.*\.jar\).*"`; then
+if test ! `expr "$CP" : ".*\(bcel[^\.]*\.jar\).*"`; then
   echo "*** you don't seem to have bcel.jar in your CLASSPATH, please fix ***"
   exit
 fi
-if test ! `expr $CP : ".*\(xercesImpl\.jar\).*"`; then
+if test ! `expr "$CP" : ".*\(xercesImpl\.jar\).*"`; then
   echo "*** you don't seem to have the Xerces libs in your CLASSPATH, please fix ***"
   exit
 fi
 #no good way to check for the MD5 since it could be a zip, a jar, or just a path
 
-
 if test -z $JVM_FLAGS; then
   JVM_FLAGS="-Xmx1024m"
 fi
 
 java $JVM_FLAGS -classpath "$CP" gov.nasa.jpf.JPF  "$@"
+