pinokiod 2.15.4 → 2.15.6

package/kernel/bin/index.js

@@ -149,6 +149,9 @@ class Bin {
       }
     }).filter(x => x)
 
+
+    console.log("****** envs", JSON.stringify(envs, null, 2))
+
     // 2. Merge module envs
     let e = {}
     for(let env of envs) {

package/kernel/shell.js

@@ -189,8 +189,11 @@ class Shell {
       if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(key) && key !== "ProgramFiles(x86)") {
         delete this.env[key]
       }
-      if (/[\r\n]/.test(this.env[key])) {
-        delete this.env[key]
+      let val = this.env[key]
+      if (/[\r\n]/.test(val) {
+        const replaced = val.replaceAll(/[\r\n]+/g, ' ');
+        this.env[key] = replaced
+//        delete this.env[key]
       }
     }
 

package/kernel/shells.js

@@ -28,7 +28,9 @@ class Shells {
 */
   async launch(params, options, ondata) {
     // iterate through all the envs
+    console.log("------- params.env before", JSON.stringify(params.env, null, 2))
     params.env = this.kernel.bin.envs(params.env)
+    console.log("------- params.env after", JSON.stringify(params.env, null, 2))
 
     let exec_path = (params.path ? params.path : ".")                         // use the current path if not specified
     let cwd = (options && options.cwd ? options.cwd : this.kernel.homedir)   // if cwd exists, use it. Otherwise the cwd is pinokio home folder (~/pinokio)              

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "2.15.4",
+  "version": "2.15.6",
   "description": "",
   "main": "index.js",
   "scripts": {