pinokiod 3.2.173 → 3.2.175
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 +12 -10
- package/package.json +1 -1
package/kernel/shell.js
CHANGED
|
@@ -536,6 +536,8 @@ class Shell {
|
|
|
536
536
|
|
|
537
537
|
// 2. conda_activation
|
|
538
538
|
|
|
539
|
+
const timeout = "C:\\Windows\\System32\\timeout"
|
|
540
|
+
|
|
539
541
|
let conda_activation = []
|
|
540
542
|
if (conda_activate) {
|
|
541
543
|
if (typeof conda_activate === "string") {
|
|
@@ -557,9 +559,9 @@ class Shell {
|
|
|
557
559
|
`conda deactivate`,
|
|
558
560
|
`conda deactivate`,
|
|
559
561
|
`conda deactivate`,
|
|
560
|
-
(this.platform === 'win32' ?
|
|
562
|
+
(this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
|
|
561
563
|
`conda activate ${env_path}`,
|
|
562
|
-
(this.platform === 'win32' ?
|
|
564
|
+
(this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
|
|
563
565
|
]
|
|
564
566
|
} else {
|
|
565
567
|
conda_activation = [
|
|
@@ -568,9 +570,9 @@ class Shell {
|
|
|
568
570
|
`conda deactivate`,
|
|
569
571
|
`conda deactivate`,
|
|
570
572
|
`conda deactivate`,
|
|
571
|
-
(this.platform === 'win32' ?
|
|
573
|
+
(this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
|
|
572
574
|
`conda activate ${env_path}`,
|
|
573
|
-
(this.platform === 'win32' ?
|
|
575
|
+
(this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
|
|
574
576
|
]
|
|
575
577
|
}
|
|
576
578
|
} else if (conda_name) {
|
|
@@ -580,9 +582,9 @@ class Shell {
|
|
|
580
582
|
`conda deactivate`,
|
|
581
583
|
`conda deactivate`,
|
|
582
584
|
`conda deactivate`,
|
|
583
|
-
(this.platform === 'win32' ?
|
|
585
|
+
(this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
|
|
584
586
|
`conda activate ${conda_name}`,
|
|
585
|
-
(this.platform === 'win32' ?
|
|
587
|
+
(this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
|
|
586
588
|
]
|
|
587
589
|
} else {
|
|
588
590
|
let envs_path = this.kernel.bin.path("miniconda/envs")
|
|
@@ -594,9 +596,9 @@ class Shell {
|
|
|
594
596
|
`conda deactivate`,
|
|
595
597
|
`conda deactivate`,
|
|
596
598
|
`conda deactivate`,
|
|
597
|
-
(this.platform === 'win32' ?
|
|
599
|
+
(this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
|
|
598
600
|
`conda activate ${conda_name}`,
|
|
599
|
-
(this.platform === 'win32' ?
|
|
601
|
+
(this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
|
|
600
602
|
]
|
|
601
603
|
} else {
|
|
602
604
|
conda_activation = [
|
|
@@ -605,9 +607,9 @@ class Shell {
|
|
|
605
607
|
`conda deactivate`,
|
|
606
608
|
`conda deactivate`,
|
|
607
609
|
`conda deactivate`,
|
|
608
|
-
(this.platform === 'win32' ?
|
|
610
|
+
(this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
|
|
609
611
|
`conda activate ${conda_name}`,
|
|
610
|
-
(this.platform === 'win32' ?
|
|
612
|
+
(this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
|
|
611
613
|
]
|
|
612
614
|
}
|
|
613
615
|
}
|