pinokiod 3.0.14 → 3.0.16

package/kernel/bin/git.js

@@ -5,7 +5,7 @@ const { rimraf } = require('rimraf')
 const path = require("path")
 class Git {
   async install(req, ondata) {
-    await this.kernel.bin.exec({ message: "conda install -y -c conda-forge git git-lfs --verbose" }, ondata)
+    await this.kernel.bin.exec({ message: "conda install -y -c conda-forge git git-lfs --debug" }, ondata)
     if (this.kernel.platform === 'win32') {
       let gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")
       // check if gitconfig exists

package/kernel/bin/huggingface.js

@@ -1,7 +1,7 @@
 class Huggingface {
   async install(req, ondata) {
     await this.kernel.bin.exec({
-      message: "conda install -y -c conda-forge huggingface_hub --verbose"
+      message: "conda install -y -c conda-forge huggingface_hub --debug"
     }, ondata)
   }
   async installed() {

package/kernel/bin/uv.js

@@ -5,7 +5,7 @@ const decompress = require('decompress');
 class UV {
   async install(req, ondata) {
     await this.kernel.bin.exec({
-      message: "conda install -y -c conda-forge uv --verbose",
+      message: "conda install -y -c conda-forge uv --debug",
     }, ondata)
   }
   async installed() {

package/kernel/bin/zip.js

@@ -2,9 +2,9 @@ class Zip {
   async install(req, ondata) {
     let cmd
     if (this.kernel.platform === 'win32') {
-      cmd = "conda install -y -c conda-forge 7zip --verbose"
+      cmd = "conda install -y -c conda-forge 7zip --debug"
     } else {
-      cmd = "conda install -y -c conda-forge p7zip --verbose"
+      cmd = "conda install -y -c conda-forge p7zip --debug"
     }
     await this.kernel.bin.exec({ message: cmd }, ondata)
   }

package/kernel/shell.js

@@ -450,9 +450,13 @@ class Shell {
 //        params.message.push(`echo "SHELL FINISHED RUNNING"\r\n`)
         // if params.message is empty, filter out
         //let delimiter = " && "
+
+        params.message.push('echo "--- pinokio shell.run finished ---"')
+
         let delimiter
         if (this.platform === "win32") {
-          delimiter = " && "; // must use &&. & doesn't necessariliy wait until the curruent command finishes
+          //delimiter = " && "; // must use &&. & doesn't necessariliy wait until the curruent command finishes
+          delimiter = " & "; // must use &&. & doesn't necessariliy wait until the curruent command finishes
         } else {
           delimiter = " ; ";
         }
@@ -817,9 +821,13 @@ ${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(".*--- pinokio shell.run finished ---.*--- pinokio shell.run finished ---.*", "g")
+
+        //let termination_prompt_re = new RegExp(this.prompt_pattern + "[ \r\n]*$", "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.0.14",
+  "version": "3.0.16",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/index.js

@@ -470,7 +470,7 @@ class Server {
       }, {
         type: "conda",
         name: ["nodejs", "ffmpeg", ],
-        args: "-c conda-forge --verbose"
+        args: "-c conda-forge --debug"
       }]
       let platform = os.platform()
       if (platform === "win32") {
@@ -489,7 +489,7 @@ class Server {
       if (this.kernel.gpu === "nvidia") {
         requirements.push({
           name: "cuda",
-          args: "--verbose"
+          args: "--debug"
         })
       }
       requirements = requirements.concat([{