pinokiod 3.312.0 → 3.314.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.312.0",
+  "version": "3.314.0",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/index.js

@@ -1648,6 +1648,7 @@ class Server {
       if (this.kernel.homedir) {
         system_env = await Environment.get(this.kernel.homedir, this.kernel)
       }
+      const hasHome = !!this.kernel.homedir
       let configArray = [{
         key: "home",
         val: this.kernel.homedir,
@@ -1693,6 +1694,7 @@ class Server {
       res.render("settings", {
         list,
         current_host: this.kernel.peer.host,
+        hasHome,
         ...peerAccess,
         platform,
         version: this.version,
@@ -5114,6 +5116,7 @@ class Server {
         if (this.kernel.homedir) {
           system_env = await Environment.get(this.kernel.homedir, this.kernel)
         }
+        const hasHome = !!this.kernel.homedir
         let configArray = [{
           key: "home",
           val: this.kernel.homedir ? this.kernel.homedir : _home,
@@ -5160,6 +5163,7 @@ class Server {
         let list = this.getPeers()
         res.render("settings", {
           current_host: this.kernel.peer.host,
+          hasHome,
           ...peerAccess,
           list,
           platform,

package/server/views/settings.ejs

@@ -512,9 +512,9 @@ document.addEventListener('DOMContentLoaded', function() {
           </select>
         <% } else { %>
           <% if (c.val) { %>
-            <input class='homepath' name="<%=c.key%>" type='text' value="<%=c.val%>" placeholder="<%=c.placeholder ? c.placeholder : ''%>">
+            <input class='homepath' name="<%=c.key%>" type='text' value="<%=c.val%>" placeholder="<%=c.placeholder ? c.placeholder : ''%>" <%= c.key === 'home' && !hasHome ? `data-first-home=\"true\"` : "" %>>
           <% } else { %>
-            <input class='homepath' name="<%=c.key%>" type='text' placeholder="<%=c.placeholder ? c.placeholder : ''%>">
+            <input class='homepath' name="<%=c.key%>" type='text' placeholder="<%=c.placeholder ? c.placeholder : ''%>" <%= c.key === 'home' && !hasHome ? `data-first-home=\"true\"` : "" %>>
           <% } %>
         <% } %>
         <% if (c.description) { %>
@@ -653,6 +653,7 @@ document.addEventListener("DOMContentLoaded", async () => {
   const homeInput = document.querySelector('input.homepath[name="home"]')
   let showHomeWarning = () => {}
   const originalHome = homeInput ? (homeInput.defaultValue || '') : ''
+  const isFirstHome = homeInput ? homeInput.dataset.firstHome === 'true' : false
   if (homeInput) {
     const warning = document.createElement('div')
     warning.className = 'home-warning hidden'
@@ -829,7 +830,7 @@ document.addEventListener("DOMContentLoaded", async () => {
       return
     }
     const isChanged = val !== originalHome
-    if (homeInput && isChanged) {
+    if (homeInput && (isFirstHome || isChanged)) {
       const confirmResult = await Swal.fire({
         title: 'Reminder',
         html: 'exFAT drives often break permissions/metadata.<br>Please double-check the path isn\u2019t on exFAT. If it looks good, click \u201cSelect\u201d to continue.',