pinokiod 3.6.34 → 3.6.35
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/package.json +1 -1
- package/server/index.js +17 -9
package/package.json
CHANGED
package/server/index.js
CHANGED
|
@@ -573,7 +573,10 @@ class Server {
|
|
|
573
573
|
query: req.query
|
|
574
574
|
})
|
|
575
575
|
} else if (pathComponents.length === 0 && req.query.mode === "settings") {
|
|
576
|
-
let system_env =
|
|
576
|
+
let system_env = {}
|
|
577
|
+
if (this.kernel.homedir) {
|
|
578
|
+
system_env = await Environment.get(this.kernel.homedir)
|
|
579
|
+
}
|
|
577
580
|
let configArray = [{
|
|
578
581
|
key: "home",
|
|
579
582
|
description: [
|
|
@@ -2047,14 +2050,16 @@ class Server {
|
|
|
2047
2050
|
// if (config.HTTPS_PROXY) {
|
|
2048
2051
|
// updated.HTTPS_PROXY = config.HTTPS_PROXY
|
|
2049
2052
|
// }
|
|
2050
|
-
|
|
2051
|
-
|
|
2052
|
-
|
|
2053
|
-
|
|
2053
|
+
if (this.kernel.homedir) {
|
|
2054
|
+
const updated = {
|
|
2055
|
+
HTTP_PROXY: config.HTTP_PROXY,
|
|
2056
|
+
HTTPS_PROXY: config.HTTPS_PROXY,
|
|
2057
|
+
NO_PROXY: config.NO_PROXY,
|
|
2058
|
+
}
|
|
2059
|
+
let fullpath = path.resolve(this.kernel.homedir, "ENVIRONMENT")
|
|
2060
|
+
console.log({ updated })
|
|
2061
|
+
await Util.update_env(fullpath, updated)
|
|
2054
2062
|
}
|
|
2055
|
-
let fullpath = path.resolve(this.kernel.homedir, "ENVIRONMENT")
|
|
2056
|
-
console.log({ updated })
|
|
2057
|
-
await Util.update_env(fullpath, updated)
|
|
2058
2063
|
}
|
|
2059
2064
|
async startLogging(homedir) {
|
|
2060
2065
|
console.log(">>>>>>> startLogging", homedir)
|
|
@@ -2366,7 +2371,10 @@ class Server {
|
|
|
2366
2371
|
} else {
|
|
2367
2372
|
_home = path.resolve(os.homedir(), "pinokio")
|
|
2368
2373
|
}
|
|
2369
|
-
let system_env =
|
|
2374
|
+
let system_env = {}
|
|
2375
|
+
if (this.kernel.homedir) {
|
|
2376
|
+
system_env = await Environment.get(this.kernel.homedir)
|
|
2377
|
+
}
|
|
2370
2378
|
let configArray = [{
|
|
2371
2379
|
key: "home",
|
|
2372
2380
|
description: [
|