pinokiod 1.3.52 → 1.3.54
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 -0
- package/package.json +1 -1
- package/server/views/settings.ejs +10 -10
package/kernel/shell.js
CHANGED
|
@@ -112,13 +112,19 @@ class Shell {
|
|
|
112
112
|
|
|
113
113
|
this.env.CMAKE_OBJECT_PATH_MAX = 1024
|
|
114
114
|
|
|
115
|
+
console.log("THIS.env before", this.env)
|
|
115
116
|
let home_env = await Environment.get(this.kernel.homedir)
|
|
117
|
+
console.log("home_env before", home_env)
|
|
116
118
|
this.env = Object.assign(this.env, home_env)
|
|
119
|
+
console.log("home_env after", this.env)
|
|
117
120
|
if (params.$parent) {
|
|
118
121
|
let api_path = await Util.api_path(params.$parent.path, this.kernel)
|
|
122
|
+
await Environment.init_folders(api_path)
|
|
119
123
|
let current_env = await Environment.get(api_path)
|
|
124
|
+
console.log({ current_env, api_path })
|
|
120
125
|
this.env = Object.assign(this.env, current_env)
|
|
121
126
|
}
|
|
127
|
+
console.log("THIS.env after", this.env)
|
|
122
128
|
let PATH_KEY;
|
|
123
129
|
if (this.env.Path) {
|
|
124
130
|
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>
|