From db35edede6527b4613ed147298be6497def457ee Mon Sep 17 00:00:00 2001
From: Richard de Boer <richard@tubul.net>
Date: Fri, 17 Apr 2020 21:49:57 +0200
Subject: [PATCH] ncstart: Save settings in data file

---
 apps.json                          | 6 ++++--
 apps/ncstart/ChangeLog             | 1 +
 apps/ncstart/boot.js               | 4 ++--
 apps/ncstart/settings-default.json | 3 ---
 apps/ncstart/settings.js           | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100644 apps/ncstart/settings-default.json

diff --git a/apps.json b/apps.json
index 6509458bf..c3544abee 100644
--- a/apps.json
+++ b/apps.json
@@ -528,20 +528,22 @@
     "id": "ncstart",
     "name": "NCEU Startup",
     "icon": "start.png",
-    "version":"0.04",
+    "version":"0.05",
     "description": "NodeConfEU 2019 'First Start' Sequence",
     "tags": "start,welcome",
     "storage": [
       {"name":"ncstart.app.js","url":"start.js"},
       {"name":"ncstart.boot.js","url":"boot.js"},
       {"name":"ncstart.settings.js","url":"settings.js"},
-      {"name":"ncstart.settings.json","url":"settings-default.json","evaluate":true},
       {"name":"ncstart.img","url":"start-icon.js","evaluate":true},
       {"name":"nc-bangle.img","url":"start-bangle.js","evaluate":true},
       {"name":"nc-nceu.img","url":"start-nceu.js","evaluate":true},
       {"name":"nc-nfr.img","url":"start-nfr.js","evaluate":true},
       {"name":"nc-nodew.img","url":"start-nodew.js","evaluate":true},
       {"name":"nc-tf.img","url":"start-tf.js","evaluate":true}
+    ],
+    "data": [
+      {"name":"ncstart.json"}
     ]
   },
   { "id": "ncfrun",
diff --git a/apps/ncstart/ChangeLog b/apps/ncstart/ChangeLog
index f4418827e..522633f7b 100644
--- a/apps/ncstart/ChangeLog
+++ b/apps/ncstart/ChangeLog
@@ -5,3 +5,4 @@
 0.04: Run again when updated
       Don't run again when settings app is updated (or absent)
       Add "Run Now" option to settings
+0.05: Don't overwrite existing settings on app update
diff --git a/apps/ncstart/boot.js b/apps/ncstart/boot.js
index e3f514f5b..094033094 100644
--- a/apps/ncstart/boot.js
+++ b/apps/ncstart/boot.js
@@ -1,11 +1,11 @@
 (function() {
-  let s = require('Storage').readJSON('ncstart.settings.json', 1)
+  let s = require('Storage').readJSON('ncstart.json', 1)
     || require('Storage').readJSON('setting.json', 1)
     || {welcomed: true} // do NOT run if global settings are also absent
   if (!s.welcomed && require('Storage').read('ncstart.app.js')) {
     setTimeout(() => {
       s.welcomed = true
-      require('Storage').write('ncstart.settings.json', s)
+      require('Storage').write('ncstart.json', s)
       load('ncstart.app.js')
     })
   }
diff --git a/apps/ncstart/settings-default.json b/apps/ncstart/settings-default.json
deleted file mode 100644
index d250efff5..000000000
--- a/apps/ncstart/settings-default.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "welcomed": false
-}
diff --git a/apps/ncstart/settings.js b/apps/ncstart/settings.js
index 2b24095cf..6780264a7 100644
--- a/apps/ncstart/settings.js
+++ b/apps/ncstart/settings.js
@@ -1,13 +1,13 @@
 // The welcome app is special, and gets to use global settings
 (function(back) {
-  let settings = require('Storage').readJSON('ncstart.settings.json', 1)
+  let settings = require('Storage').readJSON('ncstart.json', 1)
     || require('Storage').readJSON('setting.json', 1) || {}
   E.showMenu({
     '': { 'title': 'NCEU Startup' },
     'Run on Next Boot': {
       value: !settings.welcomed,
       format: v => v ? 'OK' : 'No',
-      onchange: v => require('Storage').write('ncstart.settings.json', {welcomed: !v}),
+      onchange: v => require('Storage').write('ncstart.json', {welcomed: !v}),
     },
     'Run Now': () => load('ncstart.app.js'),
     '< Back': back,