[FOray-commit] SF.net SVN: foray: [8256] trunk/foray/scripts/foray.sh

Revision: 8256
          http://svn.sourceforge.net/foray/?rev=8256&view=rev
Author:   victormote
Date:     2006-09-30 11:09:59 -0700 (Sat, 30 Sep 2006)

Log Message:
-----------
Clean up startup scripts to be used from the distribution instead of a repository sandbox.

Modified Paths:
--------------
    trunk/foray/scripts/foray.sh

Modified: trunk/foray/scripts/foray.sh
===================================================================
--- trunk/foray/scripts/foray.sh	2006-09-30 17:32:29 UTC (rev 8255)
+++ trunk/foray/scripts/foray.sh	2006-09-30 18:09:59 UTC (rev 8256)
@@ -5,15 +5,6 @@
 # not work with a repository sandbox without modification unless the "foray"
 # jar files are built and added to the lib directory.
 
-# Constants
-FORAY_VERSION="0.2b1"
-
-if [ -z "$FORAY_HOME" ]
-then
-  echo "Environment Variable FORAY_HOME not set. Aborting."
-  exit 1
-fi
-
 JAVACMD=$JAVA_HOME/bin/java
 if [ ! -x "$JAVACMD" ] ; then
   echo "Error: JAVA_HOME is not defined correctly."
@@ -21,43 +12,26 @@
   exit
 fi
 
+FORAY_CP=""
 if [ -n "$CLASSPATH" ] ; then
-  LOCALCLASSPATH=$CLASSPATH
+  FORAY_CP=$CLASSPATH
 fi
 
-# add foray.jar, which resides in $FORAY_HOME/build
-FORAY_JAR=foray-$FORAY_VERSION.jar
-LOCALCLASSPATH=$FORAY_HOME/build/$FORAY_JAR:$LOCALCLASSPATH
+# Add the library jar files to the FOray classpath
+FORAY_LIB=../lib
 
-# If AXSL_HOME exists, add its build before the one in lib
-if [ -n "$AXSL_HOME" ]
-then
-  for I in `ls $AXSL_HOME/build/ant/*.jar`
-  do
-    LOCALCLASSPATH="$I":"$LOCALCLASSPATH"
-  done
-fi
-
-# add in the dependency .jar files
-DIRLIBS=${FORAY_HOME}/lib/*.jar
-for i in ${DIRLIBS}
+for i in `ls $FORAY_LIB/*.jar`
 do
-    # if the directory is empty, then it will return the input string
-    # this is stupid, so case for it
-    if [ "$i" != "${DIRLIBS}" ] ; then
-      if [ -z "$LOCALCLASSPATH" ] ; then
-        LOCALCLASSPATH=$i
-      else
-        LOCALCLASSPATH="$i":$LOCALCLASSPATH
-      fi
-    fi
+  FORAY_CP="$i":$FORAY_CP
 done
 
 $JAVACMD \
   $FORAY_JAVA_OPTIONS \
-  -classpath "$LOCALCLASSPATH" \
+  -classpath "$FORAY_CP" \
   $FORAY_OPTIONS \
   org.foray.app.FOray \
   $*
 
+unset FORAY_CP
+
 ##### Last Line of Script #####


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.