blob: 80aaa0127bdb40fdea5d36fcb154f4ac67b338fc (
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
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
$NetBSD: patch-bin_scala,v 1.1 2011/09/30 07:56:14 yyamano Exp $
Hardwire paths to installed files and Java binary.
--- bin/scala.orig 2011-08-29 16:44:19.000000000 +0000
+++ bin/scala
@@ -48,23 +48,7 @@ case "`uname`" in
esac
# Finding the root folder for this Scala distribution
-SOURCE=$0;
-SCRIPT=`basename "$SOURCE"`;
-while [ -h "$SOURCE" ]; do
- SCRIPT=`basename "$SOURCE"`;
- LOOKUP=`ls -ld "$SOURCE"`;
- TARGET=`expr "$LOOKUP" : '.*-> \(.*\)$'`;
- if expr "${TARGET:-.}/" : '/.*/$' > /dev/null; then
- SOURCE=${TARGET:-.};
- else
- SOURCE=`dirname "$SOURCE"`/${TARGET:-.};
- fi;
-done;
-
-# see #2092
-SCALA_HOME=`dirname "$SOURCE"`
-SCALA_HOME=`cd "$SCALA_HOME"; pwd -P`
-SCALA_HOME=`cd "$SCALA_HOME"/..; pwd`
+SCALA_HOME=@SCALA_HOME@
# Remove spaces from SCALA_HOME on windows
if $cygwin; then
@@ -150,7 +134,7 @@ if [ -z "$JAVACMD" -a -n "$JAVA_HOME" -a
JAVACMD="$JAVA_HOME/bin/java"
fi
-"${JAVACMD:=java}" \
+"${JAVACMD:=@JAVA_HOME@/bin/java}" \
$JAVA_OPTS \
"${java_args[@]}" \
${CPSELECT}${TOOL_CLASSPATH} \
|
