equal
deleted
inserted
replaced
11 for ARG in "${JAVA_ARGS[@]}" |
11 for ARG in "${JAVA_ARGS[@]}" |
12 do |
12 do |
13 SCALA_ARGS["${#SCALA_ARGS[@]}"]="-J$ARG" |
13 SCALA_ARGS["${#SCALA_ARGS[@]}"]="-J$ARG" |
14 done |
14 done |
15 |
15 |
16 classpath "$ISABELLE_SETUP_CLASSPATH" |
16 classpath "$ISABELLE_SETUP_CLASSPATH"; unset ISABELLE_SETUP_CLASSPATH |
17 unset ISABELLE_SETUP_CLASSPATH |
17 classpath "$CLASSPATH"; unset CLASSPATH |
18 |
|
19 [ -n "$CLASSPATH" ] && classpath "$CLASSPATH" |
|
20 unset CLASSPATH |
|
21 |
18 |
22 isabelle_scala scala "${SCALA_ARGS[@]}" \ |
19 isabelle_scala scala "${SCALA_ARGS[@]}" \ |
23 -classpath "$(platform_path "$ISABELLE_CLASSPATH")" \ |
20 -classpath "$(platform_path "$ISABELLE_CLASSPATH")" \ |
24 -Disabelle.scala.classpath="$(platform_path "$ISABELLE_CLASSPATH")" "$@" |
21 -Disabelle.scala.classpath="$(platform_path "$ISABELLE_CLASSPATH")" "$@" |