Merge branch 'espruino:master' into master

apps/messages/ChangeLog

@@ -63,3 +63,4 @@
 0.47: Add new Icons (Nextbike, Mattermost, etc.)
 0.48: When getting new message from the clock, only buzz once the messages app is loaded
 0.49: Change messages icon (to fit within 24px) and ensure widget renders icons centrally
+0.50: Option to disable auto-open of messages

apps/messages/lib.js

@@ -62,12 +62,10 @@ exports.pushMessage = function(event) {
   var quiet       = (require('Storage').readJSON('setting.json',1)||{}).quiet;
   var appSettings = require('Storage').readJSON('messages.settings.json',1)||{};
   var unlockWatch = appSettings.unlockWatch;
-  var quietNoAutOpn = appSettings.quietNoAutOpn;
-  delete appSettings;
   // don't auto-open messages in quiet mode if quietNoAutOpn is true
-  if(quiet && quietNoAutOpn) {
+  if((quiet && appSettings.quietNoAutOpn) || appSettings.noAutOpn)
-      loadMessages = false;
+    loadMessages = false;
-  }
+  delete appSettings;
   // after a delay load the app, to ensure we have all the messages
   if (exports.messageTimeout) clearTimeout(exports.messageTimeout);
   exports.messageTimeout = setTimeout(function() {

apps/messages/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "messages",
   "name": "Messages",
-  "version": "0.49",
+  "version": "0.50",
   "description": "App to display notifications from iOS and Gadgetbridge/Android",
   "icon": "app.png",
   "type": "app",

apps/messages/settings.js

@@ -64,6 +64,10 @@
       value: !!settings().quietNoAutOpn,
       onchange: v => updateSetting("quietNoAutOpn", v)
     },
+    /*LANG*/'Disable auto-open': {
+      value: !!settings().noAutOpn,
+      onchange: v => updateSetting("noAutOpn", v)
+    },
     /*LANG*/'Widget messages': {
       value:0|settings().maxMessages,
       min: 1, max: 5,

bin/apploader.js

@@ -1,4 +1,4 @@
-#!/usr/bin/nodejs
+#!/usr/bin/env nodejs
 /* Simple Command-line app loader for Node.js
 ===============================================
 

bin/create_app_supports_field.js

@@ -1,4 +1,4 @@
-#!/usr/bin/nodejs
+#!/usr/bin/env nodejs
 /* Quick hack to add proper 'supports' field to apps.json
 */
 

bin/create_apps_json.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # ================================================================
 # apps.json used to contain the metadata for every app. Now the
 # metadata is stored in each apps's directory - app/yourapp/metadata.js

bin/firmwaremaker.js

@@ -1,4 +1,4 @@
-#!/usr/bin/nodejs
+#!/usr/bin/env nodejs
 /*
 Mashes together a bunch of different apps to make
 a single firmware JS file which can be uploaded.

bin/firmwaremaker_c.js

@@ -1,4 +1,4 @@
-#!/usr/bin/node
+#!/usr/bin/env node
 /*
 Mashes together a bunch of different apps into a big binary blob.
 We then store this *inside* the Bangle.js firmware and can use it

bin/pre-publish.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 cd `dirname $0`/..
 nodejs bin/sanitycheck.js || exit 1

bin/sanitycheck.js

@@ -1,4 +1,4 @@
-#!/usr/bin/node
+#!/usr/bin/env node
 /* Checks for any obvious problems in apps.json
 */
 

bin/thumbnailer.js

@@ -1,4 +1,4 @@
-#!/usr/bin/node
+#!/usr/bin/env node
 
 /*
 var EMULATOR = "banglejs2";

tests/Layout/bin/runalltests.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 cd `dirname $0`/..
 ls tests/*.js | xargs -I{} bin/runtest.sh {}

tests/Layout/bin/runtest.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Requires Linux x64 (for ./espruino)
 # Also imagemagick for display