pinokiod 1.3.51 → 1.3.53
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 +6 -2
- package/package.json +1 -1
- package/server/views/settings.ejs +10 -10
package/kernel/shell.js
CHANGED
|
@@ -12,7 +12,7 @@ const path = require("path")
|
|
|
12
12
|
const sudo = require("sudo-prompt-programfiles-x86");
|
|
13
13
|
const unparse = require('yargs-unparser-custom-flag');
|
|
14
14
|
const shellPath = require('shell-path');
|
|
15
|
-
const
|
|
15
|
+
const Util = require('./util')
|
|
16
16
|
const Environment = require('./environment')
|
|
17
17
|
const home = os.homedir()
|
|
18
18
|
class Shell {
|
|
@@ -112,9 +112,13 @@ class Shell {
|
|
|
112
112
|
|
|
113
113
|
this.env.CMAKE_OBJECT_PATH_MAX = 1024
|
|
114
114
|
|
|
115
|
-
// Well Known Cache
|
|
116
115
|
let home_env = await Environment.get(this.kernel.homedir)
|
|
117
116
|
this.env = Object.assign(this.env, home_env)
|
|
117
|
+
if (params.$parent) {
|
|
118
|
+
let api_path = await Util.api_path(params.$parent.path, this.kernel)
|
|
119
|
+
let current_env = await Environment.get(api_path)
|
|
120
|
+
this.env = Object.assign(this.env, current_env)
|
|
121
|
+
}
|
|
118
122
|
let PATH_KEY;
|
|
119
123
|
if (this.env.Path) {
|
|
120
124
|
PATH_KEY = "Path"
|
package/package.json
CHANGED
|
@@ -290,17 +290,17 @@ hr {
|
|
|
290
290
|
<div class='loading hidden'>
|
|
291
291
|
<i class="fa-solid fa-circle-notch fa-spin"></i> Stand by. Do not close this window..
|
|
292
292
|
</div>
|
|
293
|
-
<hr/>
|
|
294
|
-
<div class='advanced'>
|
|
295
|
-
<h1>Advanced Settings</h1>
|
|
296
|
-
<br>
|
|
297
|
-
<br>
|
|
298
|
-
<div>Edit the system ENVIRONMENT file to customize pinokio system wide settings, such as where files are stored, terminal behavior, etc.</div>
|
|
299
|
-
<br>
|
|
300
|
-
<a class='btn' href="/edit/ENVIRONMENT">Edit ENVIRONMENT</a>
|
|
301
|
-
</div>
|
|
302
|
-
<hr/>
|
|
303
293
|
<% if (locals.bin) { %>
|
|
294
|
+
<hr/>
|
|
295
|
+
<div class='advanced'>
|
|
296
|
+
<h1>Advanced Settings</h1>
|
|
297
|
+
<br>
|
|
298
|
+
<br>
|
|
299
|
+
<div>Edit the system ENVIRONMENT file to customize pinokio system wide settings, such as where files are stored, terminal behavior, etc.</div>
|
|
300
|
+
<br>
|
|
301
|
+
<a class='btn' href="/edit/ENVIRONMENT">Edit ENVIRONMENT</a>
|
|
302
|
+
</div>
|
|
303
|
+
<hr/>
|
|
304
304
|
<div class='troubleshoot'>
|
|
305
305
|
<h1>Troubleshoot</h1>
|
|
306
306
|
<br>
|