This is an automated email from the git hooks/post-receive script. ehashman-guest pushed a commit to branch master in repository clojure.
commit 13ccbaf701f46bb97bcf5a6410bccf71fe52f1d7 Author: Elana Hashman <[email protected]> Date: Tue Feb 27 14:41:35 2018 -0500 Update clojure wrappers with new classpath --- debian/scripts/clojure | 4 +++- debian/scripts/clojurec | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/scripts/clojure b/debian/scripts/clojure index f84626c..87f605c 100644 --- a/debian/scripts/clojure +++ b/debian/scripts/clojure @@ -6,6 +6,8 @@ else extra_classpath=":$CLASSPATH" fi +clojure_classpath="/usr/share/java/clojure-@[email protected]:/usr/share/maven-repo/org/clojure/spec.alpha/debian/spec.alpha-debian.jar:/usr/share/maven-repo/org/clojure/core.specs.alpha/debian/core.specs.alpha-debian.jar" + while true ; do case "$1" in -cp | -classpath) @@ -23,4 +25,4 @@ if [ "x$1" = "x" -a "x`which rlwrap`" != "x" ] ; then rlwrap="rlwrap -r -c -C clojure -f /etc/rlwrap/clojure@VER@ -b (){}[],^%\$#@\"\";:''|\\" fi -exec $rlwrap java -cp /usr/share/java/clojure-@[email protected]"$extra_classpath" clojure.main "$@" +exec $rlwrap java -cp "$clojure_classpath""$extra_classpath" clojure.main "$@" diff --git a/debian/scripts/clojurec b/debian/scripts/clojurec index 35e923e..1b2e0cc 100644 --- a/debian/scripts/clojurec +++ b/debian/scripts/clojurec @@ -14,6 +14,8 @@ else extra_classpath=":$CLASSPATH" fi +clojure_classpath="/usr/share/java/clojure-@[email protected]:/usr/share/maven-repo/org/clojure/spec.alpha/debian/spec.alpha-debian.jar:/usr/share/maven-repo/org/clojure/core.specs.alpha/debian/core.specs.alpha-debian.jar" + while true ; do case "$1" in -d) @@ -33,4 +35,4 @@ while true ; do esac done -exec java -cp /usr/share/java/clojure-@[email protected]:"$dest_dir$extra_classpath" -Dclojure.compile.path="$dest_dir" -Dclojure.compile.warn-on-reflection=$warn_reflect clojure.lang.Compile "$@" +exec java -cp "$clojure_classpath":"$dest_dir$extra_classpath" -Dclojure.compile.path="$dest_dir" -Dclojure.compile.warn-on-reflection=$warn_reflect clojure.lang.Compile "$@" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/clojure.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
