pinokiod 3.0.12 → 3.0.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/kernel/shell.js +10 -2
- package/package.json +1 -1
package/kernel/shell.js
CHANGED
|
@@ -450,9 +450,13 @@ class Shell {
|
|
|
450
450
|
// params.message.push(`echo "SHELL FINISHED RUNNING"\r\n`)
|
|
451
451
|
// if params.message is empty, filter out
|
|
452
452
|
//let delimiter = " && "
|
|
453
|
+
|
|
454
|
+
params.message.push('echo "--- pinokio shell.run finished ---"')
|
|
455
|
+
|
|
453
456
|
let delimiter
|
|
454
457
|
if (this.platform === "win32") {
|
|
455
|
-
delimiter = " && "; // must use &&. & doesn't necessariliy wait until the curruent command finishes
|
|
458
|
+
//delimiter = " && "; // must use &&. & doesn't necessariliy wait until the curruent command finishes
|
|
459
|
+
delimiter = " & "; // must use &&. & doesn't necessariliy wait until the curruent command finishes
|
|
456
460
|
} else {
|
|
457
461
|
delimiter = " ; ";
|
|
458
462
|
}
|
|
@@ -817,9 +821,13 @@ ${cleaned}
|
|
|
817
821
|
// Decide whether to kill or continue
|
|
818
822
|
if (this.ready) {
|
|
819
823
|
// when ready, watch out for the prompt pattern that terminates with [\r\n ]
|
|
820
|
-
|
|
824
|
+
|
|
825
|
+
let termination_prompt_re = new RegExp(".*--- pinokio shell.run finished ---.*--- pinokio shell.run finished ---.*", "g")
|
|
826
|
+
|
|
827
|
+
//let termination_prompt_re = new RegExp(this.prompt_pattern + "[ \r\n]*$", "g")
|
|
821
828
|
let line = cleaned.replaceAll(/[\r\n]/g, "")
|
|
822
829
|
let test = line.match(termination_prompt_re)
|
|
830
|
+
console.log({ line, test, termination_prompt_re })
|
|
823
831
|
if (test) {
|
|
824
832
|
let cache = cleaned
|
|
825
833
|
let cached_msg = msg
|