pinokiod 2.1.18 → 2.1.20
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/bin/index.js +1 -1
- package/kernel/shell.js +4 -4
- package/package.json +1 -1
package/kernel/bin/index.js
CHANGED
|
@@ -138,7 +138,7 @@ class Bin {
|
|
|
138
138
|
if (mod.name === "vs") {
|
|
139
139
|
// don't include vs now
|
|
140
140
|
// instead, include it after conda activation, since this should be top priority and even higher priority than conda activated environment variables
|
|
141
|
-
this.
|
|
141
|
+
this.vs_path_env = mod.mod.env(this.kernel)
|
|
142
142
|
return null
|
|
143
143
|
} else {
|
|
144
144
|
if (mod.mod.env) {
|
package/kernel/shell.js
CHANGED
|
@@ -572,10 +572,10 @@ class Shell {
|
|
|
572
572
|
}
|
|
573
573
|
|
|
574
574
|
// Visual Studio Build Tools (Exception)
|
|
575
|
-
const
|
|
576
|
-
console.log({
|
|
577
|
-
if (
|
|
578
|
-
const vs = `conda env config vars set ${
|
|
575
|
+
const vs_path_env = this.kernel.bin.vs_path_env
|
|
576
|
+
console.log({ vs_path_env })
|
|
577
|
+
if (vs_path_env && vs_path_env.PATH) {
|
|
578
|
+
const vs = `conda env config vars set ${vs_path_env.PATH.join(path.delimiter)}${path.delimiter}%PATH%`
|
|
579
579
|
console.log({ vs })
|
|
580
580
|
conda_activation.push(vs)
|
|
581
581
|
}
|