pinokiod 3.0.11 → 3.0.12
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 +2 -10
- package/package.json +1 -1
package/kernel/shell.js
CHANGED
|
@@ -450,13 +450,9 @@ 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
|
-
|
|
456
453
|
let delimiter
|
|
457
454
|
if (this.platform === "win32") {
|
|
458
|
-
|
|
459
|
-
delimiter = " & "; // must use &&. & doesn't necessariliy wait until the curruent command finishes
|
|
455
|
+
delimiter = " && "; // must use &&. & doesn't necessariliy wait until the curruent command finishes
|
|
460
456
|
} else {
|
|
461
457
|
delimiter = " ; ";
|
|
462
458
|
}
|
|
@@ -821,13 +817,9 @@ ${cleaned}
|
|
|
821
817
|
// Decide whether to kill or continue
|
|
822
818
|
if (this.ready) {
|
|
823
819
|
// when ready, watch out for the prompt pattern that terminates with [\r\n ]
|
|
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")
|
|
820
|
+
let termination_prompt_re = new RegExp(this.prompt_pattern + "[ \r\n]*$", "g")
|
|
828
821
|
let line = cleaned.replaceAll(/[\r\n]/g, "")
|
|
829
822
|
let test = line.match(termination_prompt_re)
|
|
830
|
-
console.log({ line, test, termination_prompt_re })
|
|
831
823
|
if (test) {
|
|
832
824
|
let cache = cleaned
|
|
833
825
|
let cached_msg = msg
|