Skip to content

Commit e57a21a

Browse files
committed
use JAVA_HOME if defined (fixes #6)
1 parent ecd6fd7 commit e57a21a

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

kscript

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,16 @@ if [ ! -f "${jarFile}" ]; then
6565
}
6666
'> ${mainJava}
6767

68-
javac ${mainJava} 2> /dev/null
68+
## prefer JAVA_HOME over PATH for javac and jar (to stay in sync with kotlinc; see #6)
69+
if [ -n "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then
70+
JAVAC_CMD="$JAVA_HOME/bin/javac"
71+
JAR_CMD="$JAVA_HOME/bin/jar"
72+
fi
73+
74+
${JAVAC_CMD:=java} ${mainJava} 2> /dev/null
6975

7076
## update the jar to include main-wrapper
71-
(cd $(dirname ${mainJava}) && jar uf ${jarFile} $(basename ${mainJava%%.java}.class))
77+
(cd $(dirname ${mainJava}) && ${JAR_CMD:=jar} uf ${jarFile} $(basename ${mainJava%%.java}.class))
7278
fi
7379

7480

0 commit comments

Comments
 (0)