pinokiod 3.5.9 → 3.5.10
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/conda.js +1 -1
- package/kernel/index.js +1 -1
- package/kernel/shell.js +10 -14
- package/package.json +1 -1
package/kernel/bin/conda.js
CHANGED
|
@@ -197,7 +197,7 @@ report_errors: false`)
|
|
|
197
197
|
}
|
|
198
198
|
ondata({ raw: `${cmd}\r\n` })
|
|
199
199
|
ondata({ raw: `path: ${this.kernel.bin.path()}\r\n` })
|
|
200
|
-
await this.kernel.bin.exec({ message: cmd,
|
|
200
|
+
await this.kernel.bin.exec({ message: cmd, conda: { skip: true } }, (stream) => {
|
|
201
201
|
ondata(stream)
|
|
202
202
|
})
|
|
203
203
|
|
package/kernel/index.js
CHANGED
|
@@ -383,7 +383,7 @@ class Kernel {
|
|
|
383
383
|
clearInterval(interval)
|
|
384
384
|
await this.bin.exec({
|
|
385
385
|
sudo: true,
|
|
386
|
-
message: `icacls ${this.homedir} /grant
|
|
386
|
+
message: `icacls ${this.homedir} /grant "S-1-1-0":(OI)(CI)F /T`
|
|
387
387
|
}, (stream) => {
|
|
388
388
|
process.stdout.write(stream.raw)
|
|
389
389
|
})
|
package/kernel/shell.js
CHANGED
|
@@ -670,11 +670,17 @@ class Shell {
|
|
|
670
670
|
// }
|
|
671
671
|
// }
|
|
672
672
|
|
|
673
|
+
/*
|
|
674
|
+
ONLY inject vcvarsall if "build": true
|
|
673
675
|
|
|
674
|
-
|
|
675
|
-
|
|
676
|
-
|
|
677
|
-
|
|
676
|
+
{
|
|
677
|
+
method,
|
|
678
|
+
params,
|
|
679
|
+
build: true
|
|
680
|
+
}
|
|
681
|
+
*/
|
|
682
|
+
if (params.build) {
|
|
683
|
+
if (this.platform === "win32") {
|
|
678
684
|
try {
|
|
679
685
|
let vcvars_path = this.kernel.bin.vs_path_env.VCVARSALL_PATH
|
|
680
686
|
if (vcvars_path) {
|
|
@@ -710,18 +716,8 @@ class Shell {
|
|
|
710
716
|
console.log('vc vars setup', e)
|
|
711
717
|
}
|
|
712
718
|
}
|
|
713
|
-
|
|
714
|
-
// const vs_path_env = this.kernel.bin.vs_path_env
|
|
715
|
-
// console.log({ vs_path_env })
|
|
716
|
-
// if (vs_path_env && vs_path_env.PATH) {
|
|
717
|
-
// this.env.VS_RELATED_PATHS = `${vs_path_env.PATH.join(path.delimiter)}${path.delimiter}`
|
|
718
|
-
// const vs = `set PATH=%VS_RELATED_PATHS%${path.delimiter}%PATH%`
|
|
719
|
-
// console.log({ vs })
|
|
720
|
-
// conda_activation.push(vs)
|
|
721
|
-
// }
|
|
722
719
|
}
|
|
723
720
|
|
|
724
|
-
|
|
725
721
|
// Update env setting
|
|
726
722
|
if (this.env) {
|
|
727
723
|
// this.env.CONDA_PIP_INTEROP_ENABLED = "1"
|