Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Changing how we create the CLASSPATH to play friendlier with our new …

…package layout.
  • Loading branch information...
commit 3eb06a5dd5c9eb69dc8f237a63d6799b18cc8854 1 parent 05e02dd
Sam Bisbee authored September 28, 2010

Showing 1 changed file with 5 additions and 11 deletions. Show diff stats Hide diff stats

  1. 16  src/main/bin/couchdb-lucene
16  src/main/bin/couchdb-lucene
@@ -33,16 +33,10 @@ getPid()
33 33
 
34 34
 start()
35 35
 {
36  
-  JAVA_OPTS="-server -Xmx1g"
37  
-  CLASS="com.github.rnewson.couchdb.lucene.Main"
  36
+  CLASSPATH="$CL_BASEDIR/etc/couchdb-lucene:$CL_BASEDIR/lib/couchdb-lucene/*"
  37
+  JAVA_OPTS="-server -Xmx1g -cp $CLASSPATH"
38 38
 
39  
-  CLASSPATH="conf"
40  
-  for JAR in `ls lib/*.jar`
41  
-  do
42  
-    CLASSPATH="$CLASSPATH:$JAR"
43  
-  done
44  
-
45  
-  command="java $JAVA_OPTS -cp $CLASSPATH $CLASS"
  39
+  command="java $JAVA_OPTS $JAR com.github.rnewson.couchdb.lucene.Main"
46 40
 
47 41
   if [ "$BACKGROUND" != "true" ]
48 42
   then
@@ -89,8 +83,8 @@ parseOptions()
89 83
 parseOptions $@
90 84
 checkEnvironment
91 85
 
92  
-[ -z $CL_BASEDIR ] && CL_BASEDIR=`dirname "$0"`
93  
-cd $CL_BASEDIR/..
  86
+[ -z $CL_BASEDIR ] && CL_BASEDIR=`dirname "$0"`"/.."
  87
+cd $CL_BASEDIR
94 88
 
95 89
 start
96 90
 

0 notes on commit 3eb06a5

Please sign in to comment.
Something went wrong with that request. Please try again.