pinokiod 3.19.56 → 3.19.58

package/kernel/shell.js

@@ -265,28 +265,28 @@ class Shell {
         this.args = ["--noprofile", "--norc"]
         //this.args = [ "--login", "-i"]
         this.EOL = "\n"
-        if (this.platform === "win32") {
-          console.log("before transform this.env", this.env)
-          for(let key in this.env) {
-            let val = this.env[key]
-            if (val && typeof val === "string") {
-              // split with ;
-              let chunks = val.split(";")
-              let transformed_chunks = []
-              for(let chunk of chunks) {
-                if (path.isAbsolute(chunk)) {
-                  let transformed = normalize(chunk) 
-                  transformed = "/" + transformed.replace(":", "")
-                  transformed_chunks.push(transformed)
-                } else {
-                  transformed_chunks.push(chunk)
-                }
-              }
-              this.env[key] = transformed_chunks.join(";")
-            }
-          }
-          console.log("after transform this.env", this.env)
-        }
+        //if (this.platform === "win32") {
+        //  console.log("before transform this.env", this.env)
+        //  for(let key in this.env) {
+        //    let val = this.env[key]
+        //    if (val && typeof val === "string") {
+        //      // split with ;
+        //      let chunks = val.split(";")
+        //      let transformed_chunks = []
+        //      for(let chunk of chunks) {
+        //        if (path.isAbsolute(chunk)) {
+        //          let transformed = :normalize(chunk) 
+        //          transformed = "/" + transformed.replace(":", "")
+        //          transformed_chunks.push(transformed)
+        //        } else {
+        //          transformed_chunks.push(chunk)
+        //        }
+        //      }
+        //      this.env[key] = transformed_chunks.join(";")
+        //    }
+        //  }
+        //  console.log("after transform this.env", this.env)
+        //}
       }
     }
     console.log({ shell: this.shell, args: this.args, eol: this.EOL })
@@ -485,9 +485,7 @@ class Shell {
       this.persistent = params.persistent
     }
     this.prompt_pattern = await this.prompt(params.path)
-    console.log("Prompt Pattern", this.prompt_pattern)
     this.cb = cb
-    console.log("This.exec")
     let r = await this.exec(params)
     return r
   }
@@ -515,8 +513,6 @@ class Shell {
 
       //let re = /([\r\n]+[^\r\n]+)(\1)/gs
       let re = /(.+)(\1)/gs
-      console.log("Prompt spawn", this.shell)
-      console.log("Prompt config", config)
       let term = pty.spawn(this.shell, this.args, config)
       let vt = new Terminal({
         allowProposedApi: true
@@ -525,19 +521,15 @@ class Shell {
       vt.loadAddon(vts)
 
       let queue = fastq((data, cb) => {
-        console.log("Vt.write", { data, prompt_ready: this.prompt_ready, prompt_done: this.prompt_done })
         if (this.prompt_ready) {
           vt.write(data, () => {
             let buf = vts.serialize()
-            console.log({ buf })
             let re = /(.+)echo pinokio[\r\n]+pinokio[\r\n]+(\1)/gs
             const match = re.exec(buf)
-            console.log({ match })
             if (match && match.length > 0) {
               this.prompt_ready = false
               this.prompt_done = true
               let stripped = this.stripAnsi(match[1])
-              console.log({ stripped, prompt_ready: this.prompt_ready, prompt_done: this.prompt_done })
               const p = stripped
                 .replaceAll(/[\r\n]/g, "")
                 .trim()
@@ -552,7 +544,6 @@ class Shell {
         }
       }, 1)
       term.onData((data) => {
-        console.log("Prompt onData", { data, prompt_ready: this.prompt_ready, prompt_done: this.prompt_done })
         if (!this.prompt_done) {
           if (this.prompt_ready) {
             queue.push(data)
@@ -560,7 +551,6 @@ class Shell {
             setTimeout(() => {
               if (!this.prompt_ready) {
                 this.prompt_ready = true
-                console.log("P", { eol: this.EOL, shell: this.shell, args: this.args, prompt_ready: this.prompt_ready })
                 term.write(`echo pinokio${this.EOL}echo pinokio${this.EOL}`)
               }
             }, 500)
@@ -593,18 +583,6 @@ class Shell {
 //        let m = params.message + delimiter + `echo "FINISHED: ${params.message}"\r\n`
 //        return m
       } else if (Array.isArray(params.message)) {
-
-        let message = []
-        if (/bash/i.test(this.shell)) {
-          message = ["set -x"]
-        }
-        for(let i=0; i<params.message.length; i++) {
-          message.push(params.message[i])
-          message.push(`echo ${i}`)
-        }
-        params.message = message
-
-
 //        params.message.push(`echo "SHELL FINISHED RUNNING"\r\n`)
         // if params.message is empty, filter out
         //let delimiter = " && "
@@ -1029,9 +1007,7 @@ class Shell {
   }
   async exec(params) {
     params = await this.activate(params)
-    console.log("#Exec 1", { params })
     this.cmd = this.build(params)
-    console.log("#Exec 2", { cmd: this.cmd })
     let res = await new Promise((resolve, reject) => {
       this.resolve = resolve
       this.reject = reject
@@ -1051,11 +1027,8 @@ class Shell {
         if (!this.ptyProcess) {
           // ptyProcess doesn't exist => create
           this.done = false
-          console.log("EXEC SPAWN")
-          console.log("EXEC config", config)
           this.ptyProcess = pty.spawn(this.shell, this.args, config)
           this.ptyProcess.onData((data) => {
-            console.log("EXEC ONDATA", data)
             if (!this.monitor) {
               this.monitor = ""
             }
@@ -1308,7 +1281,6 @@ ${cleaned}
               this.params.onready()
             }
             if (this.ptyProcess) {
-              console.log("ptyProcess.write", { cmd: this.cmd, eol: this.EOL })
               this.ptyProcess.write(`${this.cmd}${this.EOL}`)
 //              setTimeout(() => {
 //                this.ptyProcess.write('\x1B[?2004h');

package/package.json

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