pinokiod 3.2.89 → 3.2.90
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 +5 -1
- package/package.json +1 -1
package/kernel/shell.js
CHANGED
|
@@ -453,8 +453,10 @@ class Shell {
|
|
|
453
453
|
let delimiter
|
|
454
454
|
if (this.platform === "win32") {
|
|
455
455
|
delimiter = " && "; // must use &&. & doesn't necessariliy wait until the curruent command finishes
|
|
456
|
+
params.message.push(`echo "--- pinokio shell.run finished: %PINOKIO_SHELL_START% ---"`)
|
|
456
457
|
} else {
|
|
457
458
|
delimiter = " ; ";
|
|
459
|
+
params.message.push('echo "--- pinokio shell.run finished $PINOKIO_SHELL_START ---"')
|
|
458
460
|
}
|
|
459
461
|
return params.message.filter((m) => {
|
|
460
462
|
return m && !/^\s+$/.test(m)
|
|
@@ -841,9 +843,11 @@ ${cleaned}
|
|
|
841
843
|
// Decide whether to kill or continue
|
|
842
844
|
if (this.ready) {
|
|
843
845
|
// when ready, watch out for the prompt pattern that terminates with [\r\n ]
|
|
844
|
-
let termination_prompt_re = new RegExp(this.prompt_pattern + "[ \r\n]*$", "g")
|
|
846
|
+
//let termination_prompt_re = new RegExp(this.prompt_pattern + "[ \r\n]*$", "g")
|
|
847
|
+
let termination_prompt_re = new RegExp(".*--- pinokio shell.run finished: [0-9]+ ---.*", "g")
|
|
845
848
|
let line = cleaned.replaceAll(/[\r\n]/g, "")
|
|
846
849
|
let test = line.match(termination_prompt_re)
|
|
850
|
+
console.log({ line, test, termination_prompt_re })
|
|
847
851
|
if (test) {
|
|
848
852
|
let cache = cleaned
|
|
849
853
|
let cached_msg = msg
|