pinokiod 3.0.13 → 3.0.14

package/kernel/bin/conda.js

@@ -140,6 +140,9 @@ create_default_packages:
     }, (stream) => {
       ondata(stream)
     })
+    await this.kernel.bin.exec({
+      message: "conda config --add channels conda-forge"
+    }, ondata)
     if (this.kernel.platform === "win32") {
       // copy python.exe to python3.exe so you can run with both python3 and python
       await fs.promises.copyFile(

package/kernel/shell.js

@@ -450,13 +450,9 @@ 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 = " ; ";
         }
@@ -821,13 +817,9 @@ ${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(".*--- pinokio shell.run finished ---.*--- pinokio shell.run finished ---.*", "g")
-
-        //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 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.13",
+  "version": "3.0.14",
   "description": "",
   "main": "index.js",
   "scripts": {