From 0a285a80f192266604c1a5f32bc7c2996c598cc5 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Wed, 23 Nov 2022 11:02:26 +0000
Subject: [PATCH] stop non-default apps pushing themselves up to the top of the
 apps list using sort-order

---
 apps/demoapp/metadata.json        |  3 +--
 apps/fwupdate/metadata.json       |  2 +-
 apps/messages_light/metadata.json |  3 +--
 apps/nixie/nixie.info             | 10 ----------
 apps/taglaunch/metadata.json      |  3 +--
 apps/timerclk/metadata.json       |  3 +--
 6 files changed, 5 insertions(+), 19 deletions(-)
 delete mode 100644 apps/nixie/nixie.info

diff --git a/apps/demoapp/metadata.json b/apps/demoapp/metadata.json
index df6554ef5..2fb30f718 100644
--- a/apps/demoapp/metadata.json
+++ b/apps/demoapp/metadata.json
@@ -12,6 +12,5 @@
   "storage": [
     {"name":"demoapp.app.js","url":"app.js"},
     {"name":"demoapp.img","url":"app-icon.js","evaluate":true}
-  ],
-  "sortorder": -9
+  ]
 }
diff --git a/apps/fwupdate/metadata.json b/apps/fwupdate/metadata.json
index 6f70801dd..372f6850c 100644
--- a/apps/fwupdate/metadata.json
+++ b/apps/fwupdate/metadata.json
@@ -10,5 +10,5 @@
   "custom": "custom.html",
   "customConnect": true,
   "storage": [],
-  "sortorder": 20
+  "sortorder": -11
 }
diff --git a/apps/messages_light/metadata.json b/apps/messages_light/metadata.json
index 9b7ca50a8..3515a75c2 100644
--- a/apps/messages_light/metadata.json
+++ b/apps/messages_light/metadata.json
@@ -17,6 +17,5 @@
     {"name":"messages_light.boot.js","url":"messages_light.boot.js"}
   ],
   "data": [{"name":"messages_light.settings.json"},{"name":"messages_light.NewMessage.json"}],
-  "screenshots": [{"url":"screenshot-notify.png"} ,{"url":"screenshot-long-text1.png"},{"url":"screenshot-long-text2.png"}, {"url":"screenshot-call.png"} ],
-  "sortorder": -9
+  "screenshots": [{"url":"screenshot-notify.png"} ,{"url":"screenshot-long-text1.png"},{"url":"screenshot-long-text2.png"}, {"url":"screenshot-call.png"} ]
 }
diff --git a/apps/nixie/nixie.info b/apps/nixie/nixie.info
deleted file mode 100644
index 66f5ff2a5..000000000
--- a/apps/nixie/nixie.info
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-"id":"jvNixie",
-"name":"Nixie Clock",
-"type":"clock",
-"src":"nixie.app.js",
-"icon": "nixie.img",
-"sortorder":1,
-"version":"1.1",
-"files":"nixie.info,nixie.app.js,nixie.img, m_vatch.js"
-}
diff --git a/apps/taglaunch/metadata.json b/apps/taglaunch/metadata.json
index 8823aa6ec..aded51314 100644
--- a/apps/taglaunch/metadata.json
+++ b/apps/taglaunch/metadata.json
@@ -13,6 +13,5 @@
     {"name":"taglaunch.app.js","url":"app.js"},
     {"name":"taglaunch.settings.js","url":"settings.js"}
   ],
-  "data": [{"name":"taglaunch.json"},{"name":"taglaunch.cache.json"}],
-  "sortorder": -10
+  "data": [{"name":"taglaunch.json"},{"name":"taglaunch.cache.json"}]
 }
diff --git a/apps/timerclk/metadata.json b/apps/timerclk/metadata.json
index 72f42d8d4..899eda59d 100644
--- a/apps/timerclk/metadata.json
+++ b/apps/timerclk/metadata.json
@@ -30,6 +30,5 @@
 		{"name":"timerclk.alarm.js","url":"alarm.js"},
 		{"name":"timerclk.alarm.alert.js","url":"alarm.alert.js"}
 	],
-	"data": [{"name":"timerclk.json"},{"name":"timerclk.stopwatch.json"},{"name":"timerclk.timer.json"},{"name":"timerclk.alarm.json"}],
-	"sortorder": 0
+	"data": [{"name":"timerclk.json"},{"name":"timerclk.stopwatch.json"},{"name":"timerclk.timer.json"},{"name":"timerclk.alarm.json"}]
 }