diff --git a/api/src/job.js b/api/src/job.js index d46120b..8c3fa79 100644 --- a/api/src/job.js +++ b/api/src/job.js @@ -156,7 +156,11 @@ class Job { '-s', '-c', '/box/submission', - '-e', + '-E', + 'HOME=/tmp', + ...this.runtime.env_vars.flat_map(v => ['-E', v]), + '-E', + `PISTON_LANGUAGE=${this.runtime.language}`, `--dir=${this.runtime.pkgdir}`, `--dir=/etc:noexec`, `--processes=${this.runtime.max_process_count}`, @@ -175,10 +179,6 @@ class Job { ...args, ], { - env: { - ...this.runtime.env_vars, - PISTON_LANGUAGE: this.runtime.language, - }, stdio: 'pipe', } ); diff --git a/api/src/runtime.js b/api/src/runtime.js index 9a2adf4..90a2225 100644 --- a/api/src/runtime.js +++ b/api/src/runtime.js @@ -178,15 +178,7 @@ class Runtime { const env_file = path.join(this.pkgdir, '.env'); const env_content = fss.read_file_sync(env_file).toString(); - this._env_vars = {}; - - env_content - .trim() - .split('\n') - .map(line => line.split('=', 2)) - .forEach(([key, val]) => { - this._env_vars[key.trim()] = val.trim(); - }); + this._env_vars = env_content.trim().split('\n'); } return this._env_vars; diff --git a/packages/k/1.0.0/build.sh b/packages/k/1.0.0/build.sh new file mode 100644 index 0000000..567cc06 --- /dev/null +++ b/packages/k/1.0.0/build.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -e + +git clone "https://codeberg.org/ngn/k" k +cd k + +git checkout 544d014afd8dd84b18c2011cabd3aa3d76571ca3 +make CC=gcc diff --git a/packages/k/1.0.0/environment b/packages/k/1.0.0/environment new file mode 100644 index 0000000..7cde4ae --- /dev/null +++ b/packages/k/1.0.0/environment @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +# k path +export PATH=$PWD/bin:$PATH +export K_PATH=$PWD/k diff --git a/packages/k/1.0.0/metadata.json b/packages/k/1.0.0/metadata.json new file mode 100644 index 0000000..3a557f6 --- /dev/null +++ b/packages/k/1.0.0/metadata.json @@ -0,0 +1,5 @@ +{ + "language": "k", + "version": "1.0.0", + "aliases": ["ngnk"] +} diff --git a/packages/k/1.0.0/run b/packages/k/1.0.0/run new file mode 100644 index 0000000..18293ae --- /dev/null +++ b/packages/k/1.0.0/run @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +$K_PATH/k "$@" diff --git a/packages/k/1.0.0/test.k b/packages/k/1.0.0/test.k new file mode 100644 index 0000000..16fddca --- /dev/null +++ b/packages/k/1.0.0/test.k @@ -0,0 +1 @@ +`0:`c$2/'((1 0 0 1 1 1 1);(1 0 0 1 0 1 1)) diff --git a/readme.md b/readme.md index 7724fdb..02a712f 100644 --- a/readme.md +++ b/readme.md @@ -404,6 +404,7 @@ Errors may return status codes as follows: `javascript`, `jelly`, `julia`, +`k`, `kotlin`, `lisp`, `llvm_ir`,