pinokiod 2.15.61 → 2.15.62
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 +11 -11
- package/package.json +1 -1
package/kernel/shell.js
CHANGED
|
@@ -452,7 +452,7 @@ class Shell {
|
|
|
452
452
|
//let delimiter = " && "
|
|
453
453
|
let delimiter
|
|
454
454
|
if (this.platform === "win32") {
|
|
455
|
-
delimiter = " && ";
|
|
455
|
+
delimiter = " && "; // must use &&. & doesn't necessariliy wait until the curruent command finishes
|
|
456
456
|
} else {
|
|
457
457
|
delimiter = " ; ";
|
|
458
458
|
}
|
|
@@ -539,8 +539,8 @@ class Shell {
|
|
|
539
539
|
if (env_exists) {
|
|
540
540
|
conda_activation = [
|
|
541
541
|
(this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
|
|
542
|
-
`conda deactivate`,
|
|
543
|
-
`conda deactivate`,
|
|
542
|
+
// `conda deactivate`,
|
|
543
|
+
// `conda deactivate`,
|
|
544
544
|
`conda deactivate`,
|
|
545
545
|
`conda activate ${env_path}`,
|
|
546
546
|
]
|
|
@@ -548,8 +548,8 @@ class Shell {
|
|
|
548
548
|
conda_activation = [
|
|
549
549
|
(this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
|
|
550
550
|
`conda create -y -p ${env_path} ${conda_python} ${conda_args ? conda_args : ''}`,
|
|
551
|
-
`conda deactivate`,
|
|
552
|
-
`conda deactivate`,
|
|
551
|
+
// `conda deactivate`,
|
|
552
|
+
// `conda deactivate`,
|
|
553
553
|
`conda deactivate`,
|
|
554
554
|
`conda activate ${env_path}`,
|
|
555
555
|
]
|
|
@@ -558,8 +558,8 @@ class Shell {
|
|
|
558
558
|
if (conda_name === "base") {
|
|
559
559
|
conda_activation = [
|
|
560
560
|
(this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
|
|
561
|
-
`conda deactivate`,
|
|
562
|
-
`conda deactivate`,
|
|
561
|
+
// `conda deactivate`,
|
|
562
|
+
// `conda deactivate`,
|
|
563
563
|
`conda deactivate`,
|
|
564
564
|
`conda activate ${conda_name}`,
|
|
565
565
|
]
|
|
@@ -570,8 +570,8 @@ class Shell {
|
|
|
570
570
|
if (env_exists) {
|
|
571
571
|
conda_activation = [
|
|
572
572
|
(this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
|
|
573
|
-
`conda deactivate`,
|
|
574
|
-
`conda deactivate`,
|
|
573
|
+
// `conda deactivate`,
|
|
574
|
+
// `conda deactivate`,
|
|
575
575
|
`conda deactivate`,
|
|
576
576
|
`conda activate ${conda_name}`,
|
|
577
577
|
]
|
|
@@ -579,8 +579,8 @@ class Shell {
|
|
|
579
579
|
conda_activation = [
|
|
580
580
|
(this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
|
|
581
581
|
`conda create -y -n ${conda_name} ${conda_python} ${conda_args ? conda_args : ''}`,
|
|
582
|
-
`conda deactivate`,
|
|
583
|
-
`conda deactivate`,
|
|
582
|
+
// `conda deactivate`,
|
|
583
|
+
// `conda deactivate`,
|
|
584
584
|
`conda deactivate`,
|
|
585
585
|
`conda activate ${conda_name}`,
|
|
586
586
|
]
|