--- lein-pkg 2012-05-04 11:02:41.524912828 +0700 +++ lein-pkg-nix 2012-05-04 11:03:11.062543558 +0700 @@ -76,30 +76,14 @@ LEIN_PLUGIN_PATH="$(echo "$DEV_PLUGINS" | tr \\n :)" LEIN_USER_PLUGIN_PATH="$(echo "$(unique_user_plugins)" | tr \\n :)" CLASSPATH="$CLASSPATH:$LEIN_PLUGIN_PATH:$LEIN_USER_PLUGIN_PATH:test/:src/:resources/" -CLOJURE_JAR="/usr/share/java/clojure-1.2.jar:/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar" +CLOJURE_JAR="$(dirname $0)/../lib/*clojure-1.2.1.jar" # apply context specific CLASSPATH entries if [ -f .lein-classpath ]; then CLASSPATH="`cat .lein-classpath`:$CLASSPATH" fi -SHARE_JARS="ant ant-launcher classworlds clojure-1.2 clojure-contrib \ -lucene-memory maven-ant-tasks maven-artifact maven-artifact-manager \ -maven-error-diagnostics maven-model maven-settings maven-project maven-profile \ -maven-repository-metadata plexus-container-default-alpha plexus-interpolation \ -plexus-utils wagon-file wagon-http-lightweight wagon-http-shared wagon-provider-api \ -xml-apis lucene-core lucene-highlighter clucy robert-hooke lancet \ -backport-util-concurrent" # NFI why that last one is necessary -for JAR in $SHARE_JARS; do - CLASSPATH="$CLASSPATH":"/usr/share/java/$JAR.jar" -done - -# Do not use installed leiningen jar during self-compilation -if ! { [ "$1" = "compile" ] && - grep -qsE 'defproject leiningen[[:space:]]+"[[:digit:].]+"' \ - project.clj ;}; then - CLASSPATH="$CLASSPATH":/usr/share/java/leiningen-$LEIN_VERSION.jar -fi +CLASSPATH="$CLASSPATH:$(dirname $0)/../lib/*" if [ $DEBUG ]; then echo $CLASSPATH