pinokiod 3.19.49 → 3.19.51
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 +7 -3
- package/package.json +1 -1
package/kernel/shell.js
CHANGED
|
@@ -261,7 +261,7 @@ class Shell {
|
|
|
261
261
|
if (this.params.shell) {
|
|
262
262
|
this.shell = this.params.shell
|
|
263
263
|
if (/bash/i.test(this.shell)) {
|
|
264
|
-
this.args = ["--noprofile", "--norc"]
|
|
264
|
+
this.args = ["--noprofile", "--norc", "-i"]
|
|
265
265
|
this.EOL = "\n"
|
|
266
266
|
}
|
|
267
267
|
}
|
|
@@ -750,6 +750,7 @@ class Shell {
|
|
|
750
750
|
if (env_exists) {
|
|
751
751
|
conda_activation = [
|
|
752
752
|
conda_hook,
|
|
753
|
+
// timeout,
|
|
753
754
|
`conda deactivate`,
|
|
754
755
|
`conda deactivate`,
|
|
755
756
|
`conda deactivate`,
|
|
@@ -760,6 +761,7 @@ class Shell {
|
|
|
760
761
|
} else {
|
|
761
762
|
conda_activation = [
|
|
762
763
|
conda_hook,
|
|
764
|
+
// timeout,
|
|
763
765
|
`conda create -y -p ${env_path} ${conda_python} ${conda_args ? conda_args : ''}`,
|
|
764
766
|
`conda deactivate`,
|
|
765
767
|
`conda deactivate`,
|
|
@@ -773,12 +775,13 @@ class Shell {
|
|
|
773
775
|
if (conda_name === "base") {
|
|
774
776
|
conda_activation = [
|
|
775
777
|
conda_hook,
|
|
778
|
+
// timeout,
|
|
776
779
|
`conda deactivate`,
|
|
777
780
|
`conda deactivate`,
|
|
778
781
|
`conda deactivate`,
|
|
779
782
|
// timeout,
|
|
780
783
|
`conda activate ${conda_name}`,
|
|
781
|
-
timeout,
|
|
784
|
+
// timeout,
|
|
782
785
|
]
|
|
783
786
|
} else {
|
|
784
787
|
let envs_path = this.kernel.bin.path("miniconda/envs")
|
|
@@ -787,6 +790,7 @@ class Shell {
|
|
|
787
790
|
if (env_exists) {
|
|
788
791
|
conda_activation = [
|
|
789
792
|
conda_hook,
|
|
793
|
+
// timeout,
|
|
790
794
|
`conda deactivate`,
|
|
791
795
|
`conda deactivate`,
|
|
792
796
|
`conda deactivate`,
|
|
@@ -803,7 +807,7 @@ class Shell {
|
|
|
803
807
|
`conda deactivate`,
|
|
804
808
|
// timeout,
|
|
805
809
|
`conda activate ${conda_name}`,
|
|
806
|
-
timeout,
|
|
810
|
+
// timeout,
|
|
807
811
|
]
|
|
808
812
|
}
|
|
809
813
|
}
|