pinokiod 3.2.88 → 3.2.90

package/kernel/index.js

@@ -338,14 +338,11 @@ class Kernel {
 //      let contents = await fs.promises.readdir(this.homedir)
       //await this.bin.init()
       let ts = Date.now()
-      console.time("bin.init " + ts)
       this.bin.init().then(() => {
-        console.timeEnd("bin.init" + ts)
+        console.log("bin init finished")
       })
       let ts2 = Date.now()
-      console.time("api.init " + ts2)
       await this.api.init()
-      console.timeEnd("api.init " + ts2)
 
       //await this.shell.init()
 
@@ -406,9 +403,7 @@ class Kernel {
         */
         console.log("> 4")
         let ts3 = Date.now()
-        console.time("shell.init " + ts3)
         this.shell.init().then(() => {
-          console.timeEnd("shell.init" + ts3)
           if (this.envs) {
             this.template.update({
               env: this.envs,

package/kernel/shell.js

@@ -453,8 +453,10 @@ class Shell {
         let delimiter
         if (this.platform === "win32") {
           delimiter = " && "; // must use &&. & doesn't necessariliy wait until the curruent command finishes
+          params.message.push(`echo "--- pinokio shell.run finished: %PINOKIO_SHELL_START% ---"`)
         } else {
           delimiter = " ; ";
+          params.message.push('echo "--- pinokio shell.run finished $PINOKIO_SHELL_START ---"')
         }
         return params.message.filter((m) => {
           return m && !/^\s+$/.test(m)
@@ -689,6 +691,7 @@ class Shell {
           this.done = false
           this.ptyProcess = pty.spawn(this.shell, this.args, config)
           this.ptyProcess.onData((data) => {
+            console.log("****** onData", data)
             if (!this.done) {
               this.queue.push(data)
             }
@@ -840,9 +843,11 @@ ${cleaned}
       // Decide whether to kill or continue
       if (this.ready) {
         // when ready, watch out for the prompt pattern that terminates with [\r\n ]
-        let termination_prompt_re = new RegExp(this.prompt_pattern + "[ \r\n]*$", "g")
+        //let termination_prompt_re = new RegExp(this.prompt_pattern + "[ \r\n]*$", "g")
+        let termination_prompt_re = new RegExp(".*--- pinokio shell.run finished: [0-9]+ ---.*", "g")
         let line = cleaned.replaceAll(/[\r\n]/g, "")
         let test = line.match(termination_prompt_re)
+        console.log({ line, test, termination_prompt_re })
         if (test) {
           let cache = cleaned
           let cached_msg = msg

package/package.json

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