pinokiod 3.2.91 → 3.2.93
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 +13 -6
- package/package.json +1 -1
package/kernel/shell.js
CHANGED
|
@@ -559,7 +559,8 @@ class Shell {
|
|
|
559
559
|
`conda deactivate`,
|
|
560
560
|
`conda deactivate`,
|
|
561
561
|
`conda deactivate`,
|
|
562
|
-
`conda activate ${env_path}
|
|
562
|
+
(this.platform === 'win32' ? `call conda activate ${env_path}` : `conda activate ${env_path}`),
|
|
563
|
+
//`conda activate ${env_path}`,
|
|
563
564
|
]
|
|
564
565
|
} else {
|
|
565
566
|
conda_activation = [
|
|
@@ -568,7 +569,8 @@ class Shell {
|
|
|
568
569
|
`conda deactivate`,
|
|
569
570
|
`conda deactivate`,
|
|
570
571
|
`conda deactivate`,
|
|
571
|
-
`conda activate ${env_path}
|
|
572
|
+
(this.platform === 'win32' ? `call conda activate ${env_path}` : `conda activate ${env_path}`),
|
|
573
|
+
//`conda activate ${env_path}`,
|
|
572
574
|
]
|
|
573
575
|
}
|
|
574
576
|
} else if (conda_name) {
|
|
@@ -578,7 +580,8 @@ class Shell {
|
|
|
578
580
|
`conda deactivate`,
|
|
579
581
|
`conda deactivate`,
|
|
580
582
|
`conda deactivate`,
|
|
581
|
-
`conda activate ${conda_name}
|
|
583
|
+
(this.platform === 'win32' ? `call conda activate ${conda_name}` : `conda activate ${conda_name}`),
|
|
584
|
+
//`conda activate ${conda_name}`,
|
|
582
585
|
]
|
|
583
586
|
} else {
|
|
584
587
|
let envs_path = this.kernel.bin.path("miniconda/envs")
|
|
@@ -590,7 +593,8 @@ class Shell {
|
|
|
590
593
|
`conda deactivate`,
|
|
591
594
|
`conda deactivate`,
|
|
592
595
|
`conda deactivate`,
|
|
593
|
-
`conda activate ${conda_name}
|
|
596
|
+
(this.platform === 'win32' ? `call conda activate ${conda_name}` : `conda activate ${conda_name}`),
|
|
597
|
+
//`conda activate ${conda_name}`,
|
|
594
598
|
]
|
|
595
599
|
} else {
|
|
596
600
|
conda_activation = [
|
|
@@ -599,7 +603,8 @@ class Shell {
|
|
|
599
603
|
`conda deactivate`,
|
|
600
604
|
`conda deactivate`,
|
|
601
605
|
`conda deactivate`,
|
|
602
|
-
`conda activate ${conda_name}
|
|
606
|
+
(this.platform === 'win32' ? `call conda activate ${conda_name}` : `conda activate ${conda_name}`),
|
|
607
|
+
//`conda activate ${conda_name}`,
|
|
603
608
|
]
|
|
604
609
|
}
|
|
605
610
|
}
|
|
@@ -848,7 +853,9 @@ ${cleaned}
|
|
|
848
853
|
let termination_prompt_re = new RegExp(".*--- pinokio shell.run finished: [0-9]+ ---.*", "g")
|
|
849
854
|
let line = cleaned.replaceAll(/[\r\n]/g, "")
|
|
850
855
|
let test = line.match(termination_prompt_re)
|
|
851
|
-
console.log(
|
|
856
|
+
console.log(">> LINE, TEST")
|
|
857
|
+
console.log("line", line)
|
|
858
|
+
console.log("test", test)
|
|
852
859
|
if (test) {
|
|
853
860
|
let cache = cleaned
|
|
854
861
|
let cached_msg = msg
|