Merge 379b35ff74 into 1d55a41a2d

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',
             }
         );

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;

packages/vyxal/2.18.0/build.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# get Python source
+source ../../python/3.9.4/build.sh
+
+# And install the package
+
+pip install vyxal==2.18.0
+

packages/vyxal/2.18.0/environment

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+# Python path
+export PATH=$PWD/bin:$PATH

packages/vyxal/2.18.0/metadata.json

@@ -1,5 +1,5 @@
 {
     "language": "vyxal",
-    "version": "2.4.1",
+    "version": "2.18.0",
     "aliases": []
-}
+}

packages/vyxal/2.18.0/run

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+vyxal "$@"

packages/vyxal/2.18.0/test.vyxal

@@ -0,0 +1 @@
+`OK

packages/vyxal/2.4.1/build.sh

@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-# get Python source
-source ../../python/3.9.4/build.sh
-
-# add regex and pwn modules
-bin/pip3 install regex pwn
-
-# make vyxal directory
-mkdir vyxal
-cd vyxal
-
-# Vyxal install
-curl -L "https://github.com/Vyxal/Vyxal/archive/refs/tags/v2.4.1.tar.gz" -o vyxal.tar.xz
-tar xf vyxal.tar.xz --strip-components=1
-rm vyxal.tar.xz
-
-cd ..

packages/vyxal/2.4.1/environment

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-# Python and Vyxal path
-export PATH=$PWD/bin:$PATH
-export VYXAL_PATH=$PWD/vyxal
-
-# export term to fix curses warning
-export TERM=xterm

packages/vyxal/2.4.1/run

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-python3 "$VYXAL_PATH"/Vyxal.py "$1"

packages/vyxal/2.4.1/test.vyxal

@@ -1 +0,0 @@
-`OK