Merge branch 'main' into prefork

Eluminatis-of-LU · May 9, 2024 · 8f16e45 · 8f16e45
2 parents c30c52c + 2a862c9
commit 8f16e45
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/scripts/restore.sh b/scripts/restore.sh
@@ -1,4 +1,6 @@
-#!/bin/sh
+#!/bin/bash
+
+set -e
 
 apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -14,6 +16,9 @@ apt-get update && \
 		ruby \
 		golang \
 		openjdk-8-jdk-headless \
+        curl \
+		unzip \
+        zip
 
 BFLAT_VERSION=7.0.2
 
@@ -29,7 +34,7 @@ rm -rf bflat-${BFLAT_VERSION}-linux-glibc-x64.tar.gz
 
 curl -s "https://get.sdkman.io" | bash
 
-source ~/.sdkman/bin/sdkman-init.sh
+source "/root/.sdkman/bin/sdkman-init.sh"
 
 sdk install kotlin
 

diff --git a/sojj/languages.json b/sojj/languages.json
@@ -85,7 +85,7 @@
   },
   "kt": {
     "type": "compiler",
-    "compile": ["kotlinc", "foo.kt", "-include-runtime", "-d", "foo.jar"],
+    "compile": ["/root/.sdkman/candidates/kotlin/current/bin/kotlinc", "foo.kt", "-include-runtime", "-d", "foo.jar"],
     "codeFile": "foo.kt",
     "outputFile": "foo.jar",
     "execute": ["java", "-jar", "foo.jar"]