Merge branch 'develop' into fixcompliments

.travis.yml

@@ -1,7 +1,8 @@
 dist: trusty
 language: node_js
 node_js:
- - "8"
+ - "10"
+
 before_script:
  - yarn danger ci
  - npm install grunt-cli -g

CHANGELOG.md

@@ -5,8 +5,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Updated
 - updated compliments.js to handle newline in text, as textfields to not interpolate contents
-
+- updated raspberry.sh installer script to handle new platform issues, split node/npm, pm2, and screen saver changes
----
+- improve handling for armv6l devices, where electron support has gone away, add optional serveronly config option
+- change electron version 
 
 ❤️ **Donate:** Enjoying MagicMirror²? [Please consider a donation!](https://magicmirror.builders/donate) With your help we can continue to improve the MagicMirror² core.
 

js/server.js

@@ -24,7 +24,7 @@ var Server = function(config, callback) {
 
 	console.log("Starting server on port " + port + " ... ");
 
-	server.listen(port, config.address ? config.address : null);
+	server.listen(port, config.address ? config.address : "localhost");
 
 	if (config.ipWhitelist instanceof Array && config.ipWhitelist.length === 0) {
 		console.info(Utils.colors.warn("You're using a full whitelist configuration to allow for all IPs"));

package.json

@@ -34,8 +34,8 @@
   },
   "homepage": "https://magicmirror.builders",
   "devDependencies": {
-    "chai": "^4.1.2",
+    "chai": "latest",
-    "chai-as-promised": "^7.1.1",
+    "chai-as-promised": "latest",
     "current-week-number": "^1.0.7",
     "danger": "^3.1.3",
     "grunt": "latest",
@@ -47,16 +47,16 @@
     "http-auth": "^3.2.3",
     "jsdom": "^11.6.2",
     "jshint": "^2.10.2",
-    "mocha": "^4.1.0",
+    "mocha": "latest",
-    "mocha-each": "^1.1.0",
+    "mocha-each": "latest",
-    "mocha-logger": "^1.0.6",
+    "mocha-logger": "latest",
-    "spectron": "^3.8.0",
+    "spectron": "^8.0.0",
     "stylelint": "latest",
     "stylelint-config-standard": "latest",
     "time-grunt": "latest"
   },
   "optionalDependencies": {
-    "electron": "^3.0.13"
+    "electron": "^6.0.12"
   },
   "dependencies": {
     "colors": "^1.1.2",

run-start.sh

@@ -7,10 +7,12 @@ if [ -z "$DISPLAY" ]; then #If not set DISPLAY is SSH remote or tty
 fi
 # get the processor architecture
 arch=$(uname -m)
-# got the config option, if any
+
-serveronly=$(grep -i serveronly: config/config.js | awk '{print tolower($2)}' | tr -d ,\"\')
+# get the config option, if any
+# only check non comment lines
+serveronly=$(grep -v '^\s//'  config/config.js | grep -i serveronly: | awk '{print tolower($2)}' | tr -d ,\"\')
 # set default if not defined in config
-serveronly="${serveronly:=false}"
+serveronly=${serveronly:-false}
 # check for xwindows running
 xorg=$(pgrep Xorg)
 #check for macOS
@@ -60,5 +62,5 @@ if [ "$serveronly." != "false." -o  "$arch" == "armv6l" ] ||  [ "$xorg." == "."
 	fi 
 else  
 	# we can use electron directly	
-	`electron js/electron.js $1`;
+	electron js/electron.js $1;
 fi

tests/e2e/vendor_spec.js

@@ -35,7 +35,10 @@ describe("Vendors", function () {
 			it(`should return 200 HTTP code for vendor "${vendor}"`, function () {
 				urlVendor = "http://localhost:8080/vendor/" + vendors[vendor];
 				request.get(urlVendor, function (err, res, body) {
-					expect(res.statusCode).to.equal(200);
+					if (!err)
+						expect(res.statusCode).to.equal(200);
+					else
+						mlog.pending(`There error vendor 200 test ${err}`);						
 				});
 			});
 		});