Ticket #19798: clj-jline.patch

clj-jline.sh

@@ -10 +10 @@
 
 dir=$0
 while [ -h "$dir" ]; do
-    ls=`ls -ld "$dir"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
+  ls=`ls -ld "$dir"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
 
-    if expr "$link" : '/.*' > /dev/null; then
-        dir="$link"
-    else
-        dir=`dirname "$dir"`"/$link"
-    fi
+  if expr "$link" : '/.*' > /dev/null; then
+    dir="$link"
+  else
+    dir=`dirname "$dir"`"/$link"
+  fi
 done
 
 dir=`dirname $dir`
 dir=`cd "$dir" > /dev/null && pwd`
 cljjar="$dir/../$cljjar"
 jlinejar="$dir/../../jline.jar"
+cp="${PWD}:${jlinejar}:${cljjar}"
 
+# Add extra jars as specified by `.clojure` file
+# Borrowed from <http://github.com/mreid/clojure-framework>
+if [ -f .clojure ]; then
+  cp=$cp:`cat .clojure`
+fi
 
 if [ -z "$1" ]; then
-  exec java -classpath $jlinejar:$cljjar $jlineclass $cljclass
+  exec java -classpath $cp $jlineclass $cljclass
 else
   scriptname=$1
-  exec java -classpath $jlinejar:$cljjar $jlineclass $cljscript $scriptname --$*
+  exec java -classpath $cp $jlineclass $cljscript $scriptname --$*
 fi
-