blob: 3a92fb34ecfd35718a9a3d29bbe7d525358865e1 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
|
$NetBSD: patch-bin_scala,v 1.2 2013/07/05 14:40:33 ryoon Exp $
Hardwire paths to installed files and Java binary.
--- bin/scala.orig 2013-06-06 18:41:45.000000000 +0000
+++ bin/scala
@@ -68,7 +68,7 @@ if uname | grep -q ^MINGW; then
fi
# Finding the root folder for this Scala distribution
-SCALA_HOME="$(findScalaHome)"
+SCALA_HOME="@SCALA_HOME@"
SEP=":"
# Possible additional command line options
@@ -192,7 +192,7 @@ fi
# be quoted: otherwise an empty string will appear as a command line
# argument, and java will think that is the program to run.
execCommand \
- "${JAVACMD:=java}" \
+ "${JAVACMD:=@JAVA_HOME@/bin/java}" \
$JAVA_OPTS \
"${java_args[@]}" \
$(classpathArgs) \
|
