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/ngnk/1.0.0/build.sh b/packages/k/1.0.0/build.sh old mode 100755 new mode 100644 similarity index 53% rename from packages/ngnk/1.0.0/build.sh rename to packages/k/1.0.0/build.sh index b437840..567cc06 --- a/packages/ngnk/1.0.0/build.sh +++ b/packages/k/1.0.0/build.sh @@ -5,5 +5,5 @@ set -e git clone "https://codeberg.org/ngn/k" k cd k -git checkout 040f73b56f379a8298cb1747075c9e947dfe0e42 -make CC=gcc \ No newline at end of file +git checkout 544d014afd8dd84b18c2011cabd3aa3d76571ca3 +make CC=gcc diff --git a/packages/ngnk/1.0.0/environment b/packages/k/1.0.0/environment similarity index 61% rename from packages/ngnk/1.0.0/environment rename to packages/k/1.0.0/environment index 2ad3aad..7cde4ae 100644 --- a/packages/ngnk/1.0.0/environment +++ b/packages/k/1.0.0/environment @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# k path export PATH=$PWD/bin:$PATH -export K_PATH=$PWD/k \ No newline at end of file +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/ngnk/1.0.0/run b/packages/k/1.0.0/run similarity index 58% rename from packages/ngnk/1.0.0/run rename to packages/k/1.0.0/run index 5309fc9..18293ae 100644 --- a/packages/ngnk/1.0.0/run +++ b/packages/k/1.0.0/run @@ -1,3 +1,3 @@ #!/usr/bin/env bash -$K_PATH/k "$@" \ No newline at end of file +$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/packages/ngnk/1.0.0/metadata.json b/packages/ngnk/1.0.0/metadata.json deleted file mode 100644 index 9b467f1..0000000 --- a/packages/ngnk/1.0.0/metadata.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "language": "ngnk", - "version": "1.0.0", - "aliases": ["k"] -} \ No newline at end of file diff --git a/packages/ngnk/1.0.0/test.k b/packages/ngnk/1.0.0/test.k deleted file mode 100644 index 18627b8..0000000 --- a/packages/ngnk/1.0.0/test.k +++ /dev/null @@ -1 +0,0 @@ -`0:"OK"