summaryrefslogtreecommitdiff
path: root/tools/locker_scalac
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-02-03 10:11:17 -0800
committerPaul Phillips <paulp@improving.org>2012-02-03 12:47:19 -0800
commit4aa290f3ba9b1b4029304f4d19e90e68ab18d781 (patch)
treeb824f5967a303917e2db95eeefbd8063dc82e88d /tools/locker_scalac
parentc5871a974aeaed8d90794c44629bde61f516dfaa (diff)
parent4bbfed3f8fda69624ea6a96de52ba973f55900cf (diff)
downloadscala-4aa290f3ba9b1b4029304f4d19e90e68ab18d781.tar.gz
scala-4aa290f3ba9b1b4029304f4d19e90e68ab18d781.tar.bz2
scala-4aa290f3ba9b1b4029304f4d19e90e68ab18d781.zip
Merge branch 'master' into topic/inline
Diffstat (limited to 'tools/locker_scalac')
-rwxr-xr-xtools/locker_scalac8
1 files changed, 3 insertions, 5 deletions
diff --git a/tools/locker_scalac b/tools/locker_scalac
index 2ad153e929..c4b28b7bc0 100755
--- a/tools/locker_scalac
+++ b/tools/locker_scalac
@@ -1,8 +1,6 @@
-#!/bin/bash
+#!/bin/sh
#
-THISDIR=`dirname $0`
-CP=`$THISDIR/lockercp`
-CLASS="scala.tools.nsc.Main"
+CP=$($(dirname $BASH_SOURCE)/lockercp)
-java -classpath "$CP" $CLASS -usejavacp "$@"
+java $JAVA_OPTS -classpath "$CP" scala.tools.nsc.Main -usejavacp "$@"