pinokiod 3.19.50 → 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 +14 -14
- 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,38 +750,38 @@ class Shell {
|
|
|
750
750
|
if (env_exists) {
|
|
751
751
|
conda_activation = [
|
|
752
752
|
conda_hook,
|
|
753
|
-
timeout,
|
|
753
|
+
// timeout,
|
|
754
754
|
`conda deactivate`,
|
|
755
755
|
`conda deactivate`,
|
|
756
756
|
`conda deactivate`,
|
|
757
|
-
timeout,
|
|
757
|
+
// timeout,
|
|
758
758
|
`conda activate ${env_path}`,
|
|
759
|
-
timeout,
|
|
759
|
+
// timeout,
|
|
760
760
|
]
|
|
761
761
|
} else {
|
|
762
762
|
conda_activation = [
|
|
763
763
|
conda_hook,
|
|
764
|
-
timeout,
|
|
764
|
+
// timeout,
|
|
765
765
|
`conda create -y -p ${env_path} ${conda_python} ${conda_args ? conda_args : ''}`,
|
|
766
766
|
`conda deactivate`,
|
|
767
767
|
`conda deactivate`,
|
|
768
768
|
`conda deactivate`,
|
|
769
|
-
timeout,
|
|
769
|
+
// timeout,
|
|
770
770
|
`conda activate ${env_path}`,
|
|
771
|
-
timeout,
|
|
771
|
+
// timeout,
|
|
772
772
|
]
|
|
773
773
|
}
|
|
774
774
|
} else if (conda_name) {
|
|
775
775
|
if (conda_name === "base") {
|
|
776
776
|
conda_activation = [
|
|
777
777
|
conda_hook,
|
|
778
|
-
timeout,
|
|
778
|
+
// timeout,
|
|
779
779
|
`conda deactivate`,
|
|
780
780
|
`conda deactivate`,
|
|
781
781
|
`conda deactivate`,
|
|
782
|
-
timeout,
|
|
782
|
+
// timeout,
|
|
783
783
|
`conda activate ${conda_name}`,
|
|
784
|
-
timeout,
|
|
784
|
+
// timeout,
|
|
785
785
|
]
|
|
786
786
|
} else {
|
|
787
787
|
let envs_path = this.kernel.bin.path("miniconda/envs")
|
|
@@ -790,13 +790,13 @@ class Shell {
|
|
|
790
790
|
if (env_exists) {
|
|
791
791
|
conda_activation = [
|
|
792
792
|
conda_hook,
|
|
793
|
-
timeout,
|
|
793
|
+
// timeout,
|
|
794
794
|
`conda deactivate`,
|
|
795
795
|
`conda deactivate`,
|
|
796
796
|
`conda deactivate`,
|
|
797
|
-
timeout,
|
|
797
|
+
// timeout,
|
|
798
798
|
`conda activate ${conda_name}`,
|
|
799
|
-
timeout,
|
|
799
|
+
// timeout,
|
|
800
800
|
]
|
|
801
801
|
} else {
|
|
802
802
|
conda_activation = [
|
|
@@ -807,7 +807,7 @@ class Shell {
|
|
|
807
807
|
`conda deactivate`,
|
|
808
808
|
// timeout,
|
|
809
809
|
`conda activate ${conda_name}`,
|
|
810
|
-
timeout,
|
|
810
|
+
// timeout,
|
|
811
811
|
]
|
|
812
812
|
}
|
|
813
813
|
}
|