diff --git a/lxc/executors/scala b/lxc/executors/scala index 1baa5ce..8eba78d 100755 --- a/lxc/executors/scala +++ b/lxc/executors/scala @@ -1,7 +1,4 @@ #!/bin/bash -# Scala will complain if JAVA_HOME isn't set -export JAVA_HOME=/opt/java/jdk-14 - cp code.code interim.scala timeout -s KILL 10 xargs -a args.args -d '\n' scala interim.scala < stdin.stdin diff --git a/var/install.txt b/var/install.txt index cc95fbb..d332d25 100644 --- a/var/install.txt +++ b/var/install.txt @@ -139,6 +139,8 @@ cd /opt && mkdir java && cd java wget https://download.java.net/java/GA/jdk14/076bab302c7b4508975440c56f6cc26a/36/GPL/openjdk-14_linux-x64_bin.tar.gz tar -xzf openjdk-14_linux-x64_bin.tar.gz echo 'export PATH=$PATH:/opt/java/jdk-14/bin' >> /opt/.profile +# Scala will complain if JAVA_HOME isn't set +echo 'export JAVA_HOME=/opt/java/jdk-14' >> /opt/.profile source /opt/.profile # install jelly