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