Merge pull request #1872 from MichMich/2.10.1-docs

2.10.1 docs

.gitignore

@@ -59,12 +59,6 @@ Temporary Items
 .directory
 .Trash-*
 
-# Various Magic Mirror ignoramuses and anti-ignoramuses.
-
-# Don't ignore the node_helper core module.
-!/modules/node_helper
-!/modules/node_helper/**
-
 # Ignore all modules except the default modules.
 /modules/**
 !/modules/default

.snyk

@@ -1,14 +0,0 @@
-version: v1.5.2
-ignore: {}
-patch:
-  'npm:minimatch:20160620':
-    - snyk > recursive-readdir > minimatch:
-        patched: '2016-07-30T14:02:31.280Z'
-  'npm:negotiator:20160616':
-    - socket.io > engine.io > accepts > negotiator:
-        patched: '2016-07-30T14:02:31.280Z'
-  'npm:ws:20160624':
-    - socket.io > engine.io > ws:
-        patched: '2016-07-30T14:02:31.280Z'
-    - socket.io > socket.io-client > engine.io-client > ws:
-        patched: '2016-07-30T14:02:31.280Z'

.travis.yml

@@ -1,7 +1,9 @@
 dist: trusty
 language: node_js
 node_js:
- - "8"
+ - "10"
+before_install:
+  - npm i -g npm
 before_script:
  - yarn danger ci
  - npm install grunt-cli -g
@@ -9,9 +11,9 @@ before_script:
  - "sh -e /etc/init.d/xvfb start"
  - sleep 5
 script:
-- grunt
-- npm run test:unit
 - npm run test:e2e
+- npm run test:unit
+- grunt
 after_script:
  - npm list
 cache:

CHANGELOG.md

@@ -3,10 +3,39 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
----
-
 ❤️ **Donate:** Enjoying MagicMirror²? [Please consider a donation!](https://magicmirror.builders/donate) With your help we can continue to improve the MagicMirror² core.
 
+## [2.10.1] - 2020-01-10
+
+### Changed
+- Updated README.md: Added links to the official documentation website and remove links to broken installer.
+
+## [2.10.0] - 2020-01-01
+
+ℹ️ **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install`.
+
+### Added
+- Timestamps in log output.
+- Padding in dateheader mode of the calendar module.
+- New upgrade script to help users consume regular updates installers/upgrade-script.sh.
+- New script to help setup pm2, without install installers/fixuppm2.sh.
+
+### Updated
+- Updated lower bound of `lodash` and `helmet` dependencies for security patches.
+- 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.
+- Improved run-start.sh to handle for serveronly mode, by choice, or when electron not available.
+- Only check for xwindows running if not on macOS.
+
+### Fixed
+- Fixed issue in weatherforecast module where predicted amount of rain was not using the decimal symbol specified in config.js.
+- Module header now updates correctly, if a module need to dynamically show/hide its header based on a condition.
+- Fix handling of config.js for serverOnly mode commented out.
+- Fixed issue in calendar module where the debug script didn't work correctly with authentication
+- Fixed issue that some full day events were not correctly recognized as such
+- Display full day events lasting multiple days as happening today instead of some days ago if they are still ongoing
+
 ## [2.9.0] - 2019-10-01
 
 ℹ️ **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install`. If you are having issues running Electron, make sure your [Raspbian is up to date](https://www.raspberrypi.org/documentation/raspbian/updating.md).

README.md

@@ -13,194 +13,20 @@
 
 MagicMirror² focuses on a modular plugin system and uses [Electron](http://electron.atom.io/) as an application wrapper. So no more web server or browser installs necessary!
 
-## Table Of Contents
+## Documentation
+For the full documentation including **[installation instructions](https://docs.magicmirror.builders/getting-started/installation.html)**, please visit our dedicated documentation website: [https://docs.magicmirror.builders](https://docs.magicmirror.builders).
 
-- [Table Of Contents](#table-of-contents)
-- [Installation](#installation)
-  - [Raspberry Pi](#raspberry-pi)
-    - [Automatic Installation (Raspberry Pi only!)](#automatic-installation-raspberry-pi-only)
-    - [Manual Installation](#manual-installation)
-  - [Server Only](#server-only)
-  - [Client Only](#client-only)
-  - [Docker](#docker)
-- [Configuration](#configuration)
-  - [Raspberry Specific](#raspberry-specific)
-  - [General](#general)
-- [Modules](#modules)
-- [Updating](#updating)
-- [Community](#community)
-- [Contributing Guidelines](#contributing-guidelines)
-- [Enjoying MagicMirror? Consider a donation!](#enjoying-magicmirror-consider-a-donation)
-- [Manifesto](#manifesto)
-
-## Installation
-
-### Raspberry Pi
-
-#### Automatic Installation (Raspberry Pi only!)
-
-*Electron*, the app wrapper around MagicMirror², only supports the Raspberry Pi 2/3. The Raspberry Pi 0/1 is currently **not** supported. If you want to run this on a Raspberry Pi 1, use the [server only](#server-only) feature and setup a fullscreen browser yourself. (Yes, people have managed to run MM² also on a Pi0, so if you insist, search in the forums.)
-
-Note that you will need to install the latest full version of Raspbian, **don't use the Lite version**.
-
-Execute the following command on your Raspberry Pi to install MagicMirror²:
-
-```bash
-bash -c "$(curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/master/installers/raspberry.sh)"
-```
-
-#### Manual Installation
-
-1. Download and install the latest *Node.js* version:
-- `curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash -`
-- `sudo apt install -y nodejs`
-2. Clone the repository and check out the master branch: `git clone https://github.com/MichMich/MagicMirror`
-3. Enter the repository: `cd MagicMirror/`
-4. Install and run the app with: `npm install && npm start` \
-   For **Server Only** use: `npm install && node serveronly` .
-
-
-**:warning: Important!**
-
-- **The installation step for `npm install` will take a very long time**, often with little or no terminal response! \
-  For the RPi3 this is **~10** minutes and for the Rpi2 **~25** minutes. \
-  Do not interrupt or you risk getting a :broken_heart: by Raspberry Jam.
-
-
-Also note that:
-
-- `npm start` does **not** work via SSH. But you can use `DISPLAY=:0 nohup npm start &` instead. \
-  This starts the mirror on the remote display.
-- If you want to debug on Raspberry Pi you can use `npm start dev` which will start MM with *Dev Tools* enabled.
-- To access toolbar menu when in mirror mode, hit `ALT` key.
-- To toggle the (web) `Developer Tools` from mirror mode, use `CTRL-SHIFT-I` or `ALT` and select `View`.
-
-
-### Server Only
-
-In some cases, you want to start the application without an actual app window. In this case, you can start MagicMirror² in server only mode by manually running `node serveronly` or using Docker. This will start the server, after which you can open the application in your browser of choice. Detailed description below.
-
-**Important:** Make sure that you whitelist the interface/ip (`ipWhitelist`) in the server config where you want the client to connect to, otherwise it will not be allowed to connect to the server. You also need to set the local host `address` field to `0.0.0.0` in order for the RPi to listen on all interfaces and not only `localhost` (default).
-
-```javascript
-var config = {
-	address: "0.0.0.0",	// default is "localhost"
-	port: 8080,		// default
-	ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:172.17.0.1"], // default -- need to add your IP here
-	...
-};
-```
-
-
-### Client Only
-
-This is when you already have a server running remotely and want your RPi to connect as a standalone client to this instance, to show the MM from the server. Then from your RPi, you run it with: `node clientonly --address 192.168.1.5 --port 8080`. (Specify the ip address and port number of the server)
-
-
-### Docker
-
-MagicMirror² in server only mode can be deployed using [Docker](https://docker.com). After a successful [Docker installation](https://docs.docker.com/engine/installation/) you just need to execute the following command in the shell:
-
-```bash
-docker run  -d \
-	--publish 80:8080 \
-	--restart always \
-	--volume ~/magic_mirror/config:/opt/magic_mirror/config \
-	--volume ~/magic_mirror/modules:/opt/magic_mirror/modules \
-	--name magic_mirror \
-	bastilimbach/docker-magicmirror
-```
-To get more information about the available Dockerfile versions and configurations head over to the respective [GitHub repository](https://github.com/bastilimbach/docker-MagicMirror).
-
-
-## Configuration
-
-### Raspberry Specific
-
-The following wiki links are helpful for the initial configuration of your MagicMirror² operating system:
-- [Configuring the Raspberry Pi](https://github.com/MichMich/MagicMirror/wiki/Configuring-the-Raspberry-Pi)
-- [Auto Starting MagicMirror](https://github.com/MichMich/MagicMirror/wiki/Auto-Starting-MagicMirror)
-
-
-### General
-
-1. Copy `/home/pi/MagicMirror/config/config.js.sample` to `/home/pi/MagicMirror/config/config.js`. \
-   **Note:** If you used the installer script. This step is already done for you.
-
-2. Modify your required settings. \
-   Note: You can check your configuration running `npm run config:check` in `/home/pi/MagicMirror`.
-
-
-The following properties can be configured:
-
-| **Option** | **Description** |
-| --- | --- |
-| `port` | The port on which the MagicMirror² server will run on. The default value is `8080`. |
-| `address` | The *interface* ip address on which to accept connections. The default is `localhost`, which would prevent exposing the built-in webserver to machines on the local network. To expose it to other machines, use: `0.0.0.0`. |
-| `ipWhitelist` | The list of IPs from which you are allowed to access the MagicMirror². The default value is `["127.0.0.1", "::ffff:127.0.0.1", "::1"]`, which is from `localhost` only. Add your IP when needed. You can also specify IP ranges with subnet masks (`["127.0.0.1", "127.0.0.1/24"]`) or directly with (`["127.0.0.1", ["192.168.0.1", "192.168.0.100"]]`). Set `[]` to allow all IP addresses. For more information see: [follow post ipWhitelist HowTo](https://forum.magicmirror.builders/topic/1326/ipwhitelist-howto) |
-| `zoom` | This allows to scale the mirror contents with a given zoom factor. The default value is `1.0`|
-| `language` | The language of the interface. (Note: Not all elements will be localized.) Possible values are `en`, `nl`, `ru`, `fr`, etc., but the default value is `en`. |
-| `timeFormat` | The form of time notation that will be used. Possible values are `12` or `24`. The default is `24`. |
-| `units` | The units that will be used in the default weather modules. Possible values are `metric` or `imperial`. The default is `metric`. |
-| `modules` | An array of active modules. **The array must contain objects. See the next table below for more information.** |
-| `electronOptions` | An optional array of Electron (browser) options. This allows configuration of e.g. the browser screen size and position (example: `electronOptions: { fullscreen: false, width: 800, height: 600 }`). Kiosk mode can be enabled by setting `kiosk: true`, `autoHideMenuBar: false` and `fullscreen: false`. More options can be found [here](https://github.com/electron/electron/blob/master/docs/api/browser-window.md). |
-| `customCss` | The path of the `custom.css` stylesheet. The default is `css/custom.css`. |
-
-Module configuration:
-
-| **Option** | **Description** |
-| --- | --- |
-| `module` | The name of the module. This can also contain the subfolder. Valid examples include `clock`, `default/calendar` and `custommodules/mymodule`. |
-| `position` | The location of the module in which the module will be loaded. Possible values are `top_bar`, `top_left`, `top_center`, `top_right`, `upper_third`, `middle_center`, `lower_third`, `bottom_left`, `bottom_center`, `bottom_right`, `bottom_bar`, `fullscreen_above`, and `fullscreen_below`. This field is optional but most modules require this field to set. Check the documentation of the module for more information. Multiple modules with the same position will be ordered based on the order in the configuration file. |
-| `classes` | Additional classes which are passed to the module. The field is optional. |
-| `header` | To display a header text above the module, add the header property. This field is optional. |
-| `disabled` | Set disabled to `true` to skip creating the module. This field is optional. |
-| `config` | An object with the module configuration properties. Check the documentation of the module for more information. This field is optional, unless the module requires extra configuration. |
-
-## Modules
-
-The following modules are installed by default.
-
-- [**Clock**](modules/default/clock)
-- [**Calendar**](modules/default/calendar)
-- [**Current Weather**](modules/default/currentweather)
-- [**Weather Forecast**](modules/default/weatherforecast)
-- [**News Feed**](modules/default/newsfeed)
-- [**Compliments**](modules/default/compliments)
-- [**Hello World**](modules/default/helloworld)
-- [**Alert**](modules/default/alert)
-
-For more available modules, check out out the wiki page [MagicMirror² 3rd Party Modules](https://github.com/MichMich/MagicMirror/wiki/3rd-party-modules). If you want to build your own modules, check out the [MagicMirror² Module Development Documentation](modules) and don't forget to add it to the wiki and the [forum](https://forum.magicmirror.builders/category/7/showcase)!
-
-
-## Updating
-
-If you want to update your MagicMirror² to the latest version, use your terminal to go to your Magic Mirror folder and type the following command:
-
-```bash
-git pull && npm install
-```
-
-If you changed nothing more than the config or the modules, this should work without any problems.
-Type `git status` to see your changes, if there are any, you can reset them with `git reset --hard`. After that, git pull should be possible.
-
-
-## Community
-
-The community around the MagicMirror² is constantly growing. We even have a [forum](https://forum.magicmirror.builders) now where you can share your ideas, ask questions, help others and get inspired by other builders. We would love to see you there!
+## Links
+- Website: [https://magicmirror.builders](https://magicmirror.builders)
+- Documentation: [https://docs.magicmirror.builders](https://docs.magicmirror.builders)
+- Forum: [https://forum.magicmirror.builders](https://forum.magicmirror.builders)
+- Discord: [https://discord.gg/J5BAtvx](https://discord.gg/J5BAtvx)
+- Blog: [https://michaelteeuw.nl/tagged/magicmirror](https://michaelteeuw.nl/tagged/magicmirror)
+- Donations: [https://magicmirror.builders/#donate](https://magicmirror.builders/#donate)
 
 ## Contributing Guidelines
 
-Contributions of all kinds are welcome, not only in the form of code but also with regards bug reports and documentation.
-
-Please keep the following in mind:
-
-- **Bug Reports**:  Make sure you're running the latest version. If the issue(s) still persist: please open a clearly documented issue with a clear title.
-- **Minor Bug Fixes**: Please send a pull request with a clear explanation of the issue or a link to the issue it solves.
-- **Major Bug Fixes**: please discuss your approach in an GitHub issue before you start to alter a big part of the code.
-- **New Features**: please please discuss in a GitHub issue before you start to alter a big part of the code. Without discussion upfront, the pull request will not be accepted / merged.
-
-Thanks for your help in making MagicMirror² better!
+Contributions of all kinds are welcome, not only in the form of code but also with regards bug reports and documentation. For the full contribution guidelines, check out: [https://docs.magicmirror.builders/getting-started/contributing.html](https://docs.magicmirror.builders/getting-started/contributing.html)
 
 
 ## Enjoying MagicMirror? Consider a donation!
@@ -212,22 +38,6 @@ If we receive enough donations we might even be able to free up some working hou
 
 To donate, please follow [this](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=G5D8E9MR5DTD2&source=url) link.
 
-## Manifesto
-
-A real Manifesto is still to be written. Till then, Michael's response on [one of the repository issues](https://github.com/MichMich/MagicMirror/issues/1174) gives a great summary:
-
-> "... I started this project as an ultimate starter project for Raspberry Pi enthusiasts. As a matter of fact, for most of the contributors, the MagicMirror project is the first open source project they ever contributed to. This is one of the reasons why the MagicMirror project is featured in several RasPi magazines.
->
->The project has a lot of opportunities for improvement. We could use a powerful framework like Vue to ramp up the development speed. We could use SASS for better/easier css implementations. We could make it an NPM installable package. And as you say, we could bundle it up. The big downside of of of these changes is that it over complicates things: a user no longer will be able to open just one file and make a small modification and see how it works out.
->
->Of course, a bundled version can be complimentary to the regular un-bundled version. And I'm sure a lot of (new) users will opt for the bundled version. But this means those users won't be motivated to take a peek under the hood. They will just remain 'users'. They won't become contributors, and worse: they won't be motivated to take their first steps in software development.
->
->And to be honest: motivating curious users to step out of their comfort zone and take those first steps is what drives me in this project. Therefor my ultimate goal is this project is to keep it as accessible as possible."
->
-> ~ Michael Teeuw
-
-
-
 <p align="center">
 <br>
 	<a href="https://forum.magicmirror.builders/topic/728/magicmirror-is-voted-number-1-in-the-magpi-top-50"><img src="https://magicmirror.builders/img/magpi-best-watermark-custom.png" width="150" alt="MagPi Top 50"></a>

config/config.js.sample

@@ -24,7 +24,12 @@ var config = {
 	language: "en",
 	timeFormat: 24,
 	units: "metric",
-
+	// serverOnly:  true/false/"local" ,
+			     // local for armv6l processors, default 
+			     //   starts serveronly and then starts chrome browser
+			     // false, default for all  NON-armv6l devices
+			     // true, force serveronly mode, because you want to.. no UI on this device
+	
 	modules: [
 		{
 			module: "alert",

css/custom.css

@@ -1,14 +0,0 @@
-/*****************************************************
- * Magic Mirror                                      *
- * Custom CSS                                        *
- *                                                   *
- * By Michael Teeuw http://michaelteeuw.nl           *
- * MIT Licensed.                                     *
- *                                                   *
- * Add any custom CSS below.                         *
- * Changes to this files will be ignored by GIT. *
- *****************************************************/
-
- body {
- 	
- }

installers/dumpactivemodules.js

@@ -0,0 +1,15 @@
+const config = require('../config/config.js');const fs=require('fs');
+for(let m of config.modules){
+	if(!(m.disabled || false)){
+	 try {	
+		 let f=fs.statSync(m.module); 
+		 if(f.isDirectory()){ 
+			 f1=fs.statSync(m.module+'/package.json');
+			 if (f1.isFile()){
+				console.log(m.module);
+			 }
+		 }
+	 }
+	 catch (ex) {}
+  } 
+}

installers/fixuppm2.sh

@@ -0,0 +1,183 @@
+#!/bin/bash
+# Define the tested version of Node.js.
+NODE_TESTED="v10.1.0"
+NPM_TESTED="V6.0.0"
+USER=`whoami`
+PM2_FILE=pm2_MagicMirror.json
+mac=$(uname -s)
+if [ $mac == 'Darwin' ]; then
+	cmd=greadlink
+else
+	cmd=readlink
+fi
+
+if [ -d ~/MagicMirror ]; then
+	# put the log where the script is located
+	logdir=$(dirname $($cmd -f "$0"))
+	# if the script was execute from the web
+	if [[ $logdir != *"MagicMirror/installers"* ]]; then
+		# use the MagicMirror/installers folder
+		cd ~/MagicMirror/installers >/dev/null
+		logdir=$(pwd)
+		cd - >/dev/null
+	fi
+	logfile=$logdir/pm2_setup.log
+	echo the log will be saved in $logfile
+	date +"pm2 setup starting - %a %b %e %H:%M:%S %Z %Y" >>$logfile	  
+			echo system is $(uname -a) >> $logfile
+			if [ "$mac"  == "Darwin" ]; then				
+			  echo the os is macOS $(sw_vers -productVersion) >> $logfile				
+			else 
+				echo the os is $(lsb_release -a 2>/dev/null) >> $logfile
+			fi 
+			node_installed=$(which node)
+			if [ "$node_installed." == "." ]; then 
+				 # node not installed
+				echo Installing node >>$logfile
+				if [ $mac == 'Darwin' ]; then
+					brew install node
+				else	
+					NODE_STABLE_BRANCH="10.x"
+					curl -sL https://deb.nodesource.com/setup_$NODE_STABLE_BRANCH | sudo -E bash -
+					sudo apt-get install -y nodejs
+				fi 			 
+			fi 
+			node_version=$(node -v)
+			echo node version $node_version >>$logfile
+			npm_installed=$(which npm)
+			if [ "$npm_installed." == "." ]; then 
+				 # npm not installed
+				echo Installing npm >>$logfile
+				if [ $mac != 'Darwin' ]; then
+					sudo apt-get install -y npm
+				fi 			 
+			fi 		
+			# get latest 
+			echo force installing latest npm version via npm >>$logfile
+			#sudo npm i -g npm 		
+			npm_version=$(npm -v)
+			echo npm version $npm_version >>$logfile		
+			# assume pm2 will be found on the path
+			pm2cmd=pm2		
+			up=""
+			if [ $mac == 'Darwin' ]; then 
+				 up="--unsafe-perm"
+				 launchctl=launchctl
+				 launchctl_path=$(which $launchctl)
+				 `export PATH=$PATH:${launchctl_path%/$launchctl}`
+			fi			
+			# check to see if already installed
+			pm2_installed=$(which $pm2cmd)
+			if [  "$pm2_installed." != "." ]; then
+			    # does it work?
+					echo pm2 installed >> $logfile					
+					pm2_fails=$(pm2 list | grep -i -m 1 "App Name" | wc -l )
+					if [ $pm2_fails != 1 ]; then
+					   # uninstall it
+						 echo pm2 installed, but does not work, uninstalling >> $logfile
+					   sudo npm uninstall $up -g pm2
+						 # force reinstall
+				     pm2_installed=
+					fi
+			fi
+			# in not installed
+			if [  "$pm2_installed." == "." ]; then 
+				# install it. 			
+				echo pm2 not installed, installing >>$logfile			
+				result=$(sudo npm install $up -g pm2)
+				# if this is a mac
+				if [ $mac == 'Darwin' ]; then 
+					echo this is a mac, fixup for path >>$logfile
+					# get the location of pm2 install
+					# parse the npm install output to get the command
+					pm2cmd=`echo $result | awk -F -  '{print $1}' | tr -d '[:space:]'`
+					c='/pm2'		
+					# get the path only
+					echo ${pm2cmd%$c} >installers/pm2path				
+				fi	
+			fi
+	    # remove MagicMirror if defined
+			$pm2cmd delete MagicMirror >/dev/null 2>&1
+			cd ~/MagicMirror 			
+			echo get the pm2 platform specific startup command >>$logfile
+			# get the platform specific pm2 startup command
+			v=$($pm2cmd startup | tail -n 1)
+			if [ $mac != 'Darwin' ]; then
+				# check to see if we can get the OS package name (Ubuntu)
+				if [ $(which lsb_release| wc -l) >0 ]; then 
+					# fix command
+					# if ubuntu 18.04, pm2 startup gets something wrong				
+					if [ $(lsb_release  -r | grep -m1 18.04 | wc -l) > 0 ]; then
+						 v=$(echo $v | sed 's/\/bin/\/bin:\/bin/')
+					fi 
+				fi
+			fi 
+			echo startup command = $v >>$logfile
+			# execute the command returned				
+		  $v 2>&1 >>$logfile
+			echo pm2 startup command done >>$logfile
+			# is this is mac 
+			# need to fix pm2 startup, only on catalina
+			if [ $mac == 'Darwin' ]; then 
+				if [ $(sw_vers -productVersion | head -c 6) == '10.15.' ]; then
+					# only do if the faulty tag is present (pm2 may fix this, before the script is fixed)
+					if [ $(grep -m 1 UserName /Users/$USER/Library/LaunchAgents/pm2.$USER.plist | wc -l) -eq 1 ]; then 
+						# copy the pm2 startup file config
+						cp  /Users/$USER/Library/LaunchAgents/pm2.$USER.plist .
+						# edit out the UserName key/value strings
+						sed -e '/UserName/{N;d;}' pm2.$USER.plist > pm2.$USER.plist.new
+						# copy the file back 
+						sudo cp pm2.$USER.plist.new /Users/$USER/Library/LaunchAgents/pm2.$USER.plist
+					fi 
+				fi
+			fi
+			
+		# if the user is no pi, we have to fixup the pm2 json file 
+		echo configure the pm2 config file for MagicMirror >>$logfile
+		if [ "$USER"  != "pi" ]; then 
+			echo the user is not pi >>$logfile
+			# go to the installers folder`
+			cd installers
+			# edit the startup script for the right user		
+			echo change mm.sh >>$logfile
+			 if [ ! -e mm_temp.sh ]; then
+			   echo save copy of mm.sh >> $logfile
+			   cp mm.sh mm_temp.sh
+			 fi 
+			 if [ $(grep pi mm_temp.sh | wc -l) -gt 0 ]; then
+			  echo change hard coded pi username  >> $logfile
+				sed 's/pi/'$USER'/g' mm_temp.sh >mm.sh
+			 else
+			  echo change relative home path to hard coded path >> $logfile
+			  hf=$(echo $HOME |sed 's/\//\\\//g')
+			  sed 's/\~/'$hf'/g' mm_temp.sh >mm.sh
+			 fi			
+			# edit the pms config file for the right user
+			echo change $PM2_FILE >>$logfile
+			sed 's/pi/'$USER'/g' $PM2_FILE > pm2_MagicMirror_new.json
+			# make sure to use the updated file
+			PM2_FILE=pm2_MagicMirror_new.json
+			# if this is a mac
+			if [ $mac == 'Darwin' ]; then 
+				 # copy the path file to the system paths list
+				 sudo cp ./pm2path /etc/paths.d
+				 # change the name of the home path for mac
+				 sed 's/home/Users/g' $PM2_FILE > pm2_MagicMirror_new1.json
+				 # make sure to use the updated file
+				 PM2_FILE=pm2_MagicMirror_new1.json
+			fi
+			echo now using this config file $PM2_FILE >>$logfile
+			# go back one cd level
+			cd - >/dev/null
+		fi
+		echo start MagicMirror via pm2 now >>$logfile
+		# tell pm2 to start the app defined in the config file
+		$pm2cmd start $HOME/MagicMirror/installers/$PM2_FILE  
+		# tell pm2 to save that configuration, for start at boot
+		echo save MagicMirror pm2 config now  >>$logfile
+		$pm2cmd save
+		date +"pm2 setup completed - %a %b %e %H:%M:%S %Z %Y" >>$logfile
+else
+	echo It appears MagicMirror has not been installed on this system  
+	echo please run the installer, "raspberry.sh" first  
+fi

installers/raspberry.sh

@@ -1,9 +1,13 @@
 #!/bin/bash
-
 # This is an installer script for MagicMirror2. It works well enough
 # that it can detect if you have Node installed, run a binary script
 # and then download and run MagicMirror2.
 
+if [ $USER == 'root' ]; then
+	 echo Please logon as a user to execute the MagicMirror installation,  not root
+	 exit 1
+fi
+
 echo -e "\e[0m"
 echo '$$\      $$\                     $$\           $$\      $$\ $$\                                          $$$$$$\'
 echo '$$$\    $$$ |                    \__|          $$$\    $$$ |\__|                                        $$  __$$\'
@@ -18,220 +22,548 @@ echo '                       \$$$$$$  |'
 echo '                        \______/'
 echo -e "\e[0m"
 
+doInstall=1
+true=1
+false=0
 # Define the tested version of Node.js.
-NODE_TESTED="v5.1.0"
+NODE_TESTED="v10.1.0"
 NPM_TESTED="V6.0.0"
 USER=`whoami`
-PM2_FILE=~/MagicMirror/installers/pm2_MagicMirror.json
+PM2_FILE=pm2_MagicMirror.json
+force_arch=
+pm2setup=$false
 
-# Determine which Pi is running.
-ARM=$(uname -m) 
+trim() {
+    local var="$*"
+    # remove leading whitespace characters
+    var="${var#"${var%%[![:space:]]*}"}"
+    # remove trailing whitespace characters
+    var="${var%"${var##*[![:space:]]}"}"
+    echo -n "$var"
+}
 
-# Check the Raspberry Pi version.
-if [ "$ARM" != "armv7l" ]; then
-  read -p "this appears not to be a Raspberry Pi 2 or 3, do you want to continue installtion (y/N)?" choice 
-	if [[ $choice =~ ^[Nn]$ ]]; then 
-		echo -e "\e[91mSorry, your Raspberry Pi is not supported."
-		echo -e "\e[91mPlease run MagicMirror on a Raspberry Pi 2 or 3."
-		echo -e "\e[91mIf this is a Pi Zero, you are in the same boat as the original Raspberry Pi. You must run in server only mode."
-	exit;
-	fi
+
+
+mac=$(uname -s)
+if [ $mac == 'Darwin' ]; then
+  echo this is a mac | tee -a $logfile
+	cmd=greadlink
+else
+	cmd=readlink
+fi
+
+
+# put the log where the script is located
+logdir=$(dirname $($cmd -f "$0"))
+# if the script was execute from the web
+if [[ $logdir != *"MagicMirror/installers"* ]]; then
+	# use the MagicMirror/installers folder, if setup
+	if [ -d MagicMirror ]; then
+		cd ~/MagicMirror/installers >/dev/null
+			logdir=$(pwd)
+		cd - >/dev/null
+	else
+	  # use the users home folder if initial install
+	  logdir=$HOME
+	fi
+fi
+logfile=$logdir/install.log
+echo install log being saved to $logfile
+
+# Determine which Pi is running.
+date +"install starting  - %a %b %e %H:%M:%S %Z %Y" >>$logfile
+ARM=$(uname -m)
+echo installing on $ARM processor system >>$logfile
+echo the os is $(lsb_release -a 2>/dev/null) >> $logfile
+# Check the Raspberry Pi version.
+if [ "$ARM" != "armv7l" ]; then
+  read -p "this appears not to be a Raspberry Pi 2 or 3, do you want to continue installation (y/N)?" choice
+	if [[ $choice =~ ^[Nn]$ ]]; then
+	  echo user stopped install on $ARM hardware  >>$logfile
+		echo -e "\e[91mSorry, your Raspberry Pi is not supported."
+		echo -e "\e[91mPlease run MagicMirror on a Raspberry Pi 2 or 3."
+		echo -e "\e[91mIf this is a Pi Zero, the setup will configure to run in server only mode wih a local browser."
+		exit;
+	fi
+	#if [ "$ARM" == "armv6l" ]; then
+	#  echo forcing armv71 architecture for pi 0 >>$logfile
+	#  force_arch=-'--arch=armv7l'
+	# fi
 fi
 
-    
 # Define helper methods.
 function command_exists () { type "$1" &> /dev/null ;}
 function verlte() {  [ "$1" = "`echo -e "$1\n$2" | sort -V | head -n1`" ];}
 function verlt() { [ "$1" = "$2" ] && return 1 || verlte $1 $2 ;}
 
 # Update before first apt-get
-echo -e "\e[96mUpdating packages ...\e[90m"
-sudo apt-get update || echo -e "\e[91mUpdate failed, carrying on installation ...\e[90m"
+if [ $mac != 'Darwin' ]; then
+	echo -e "\e[96mUpdating packages ...\e[90m" | tee -a $logfile
+	upgrade=$false
+	update=$(sudo apt-get update 2>&1)
+	echo $update >> $logfile
+	update_rc=$?
+	if [ $update_rc -ne 0 ]; then
+	 echo -e "\e[91mUpdate failed, retrying installation ...\e[90m" | tee -a $logfile
+	 if [ $(echo $update | grep "apt-secure" | wc -l) -eq 1 ]; then
+			update=$(sudo apt-get update --allow-releaseinfo-change 2>&1)
+			update_rc=$?
+			echo $update >> $logfile
+			if [ $update_rc -ne 0 ]; then
+				echo "second apt-get update failed" $update | tee -a $logfile
+				exit 1
+			else
+				echo "second apt-get update completed ok" >> $logfile
+				upgrade=$true
+			fi
+	 fi
+	else
+		echo "apt-get update  completed ok" >> $logfile
+		upgrade=$true
+	fi
+	if [ $upgrade -eq $true ]; then
+	   upgrade_result=$(sudo apt-get upgrade 2>&1)
+		 upgrade_rc=$?
+		 echo apt upgrade result ="rc=$upgrade_rc $upgrade_result" >> $logfile
+	fi
 
-# Installing helper tools
-echo -e "\e[96mInstalling helper tools ...\e[90m"
-sudo apt-get --assume-yes install curl wget git build-essential unzip || exit
+	# Installing helper tools
+	echo -e "\e[96mInstalling helper tools ...\e[90m" | tee -a $logfile
+	sudo apt-get --assume-yes install curl wget git build-essential unzip || exit
+fi
 
 # Check if we need to install or upgrade Node.js.
-echo -e "\e[96mCheck current Node installation ...\e[0m"
+echo -e "\e[96mCheck current Node installation ...\e[0m" | tee -a $logfile
 NODE_INSTALL=false
 if command_exists node; then
-	echo -e "\e[0mNode currently installed. Checking version number.";
+	echo -e "\e[0mNode currently installed. Checking version number." | tee -a $logfile
 	NODE_CURRENT=$(node -v)
-	echo -e "\e[0mMinimum Node version: \e[1m$NODE_TESTED\e[0m"
-	echo -e "\e[0mInstalled Node version: \e[1m$NODE_CURRENT\e[0m"
+	if [ "$NODE_CURRENT." == "." ]; then
+	   NODE_CURRENT="V1.0.0"
+		 echo forcing low Node version  >> $logfile
+	fi
+	echo -e "\e[0mMinimum Node version: \e[1m$NODE_TESTED\e[0m" | tee -a $logfile
+	echo -e "\e[0mInstalled Node version: \e[1m$NODE_CURRENT\e[0m" | tee -a $logfile
 	if verlte $NODE_CURRENT $NODE_TESTED; then
-		echo -e "\e[96mNode should be upgraded.\e[0m"
+		echo -e "\e[96mNode should be upgraded.\e[0m" | tee -a $logfile
 		NODE_INSTALL=true
 
 		# Check if a node process is currenlty running.
 		# If so abort installation.
 		if pgrep "node" > /dev/null; then
-			echo -e "\e[91mA Node process is currently running. Can't upgrade."
-			echo "Please quit all Node processes and restart the installer."
+			echo -e "\e[91mA Node process is currently running. Can't upgrade." | tee -a $logfile
+			echo "Please quit all Node processes and restart the installer." | tee -a $logfile
+			echo $(ps -ef | grep node | grep -v \-\-color) | tee -a $logfile
 			exit;
 		fi
 
 	else
-		echo -e "\e[92mNo Node.js upgrade necessary.\e[0m"
+		echo -e "\e[92mNo Node.js upgrade necessary.\e[0m" | tee -a $logfile
 	fi
 
 else
-	echo -e "\e[93mNode.js is not installed.\e[0m";
+	echo -e "\e[93mNode.js is not installed.\e[0m" | tee -a $logfile
 	NODE_INSTALL=true
 fi
-
 # Install or upgrade node if necessary.
 if $NODE_INSTALL; then
-	
-	echo -e "\e[96mInstalling Node.js ...\e[90m"
+
+	echo -e "\e[96mInstalling Node.js ...\e[90m" | tee -a $logfile
 
 	# Fetch the latest version of Node.js from the selected branch
 	# The NODE_STABLE_BRANCH variable will need to be manually adjusted when a new branch is released. (e.g. 7.x)
 	# Only tested (stable) versions are recommended as newer versions could break MagicMirror.
-	
-	NODE_STABLE_BRANCH="10.x"
- 	curl -sL https://deb.nodesource.com/setup_$NODE_STABLE_BRANCH | sudo -E bash -
- 	sudo apt-get install -y nodejs
-	echo -e "\e[92mNode.js installation Done!\e[0m"
+	if [ $mac == 'Darwin' ]; then
+	  brew install node
+	else
+		NODE_STABLE_BRANCH="10.x"
+		# sudo apt-get install --only-upgrade libstdc++6
+		node_info=$(curl -sL https://deb.nodesource.com/setup_$NODE_STABLE_BRANCH | sudo -E bash - )
+		echo Node release info = $node_info >> $logfile
+		if [ "$(echo $node_info | grep "not currently supported")." == "." ]; then
+			sudo apt-get install -y nodejs
+		else
+			echo node $NODE_STABLE_BRANCH version installer not available, doing manually >>$logfile
+			# no longer supported install
+			sudo apt-get install -y --only-upgrade libstdc++6 >> $logfile
+			# have to do it manually
+			node_vnum=$(echo $NODE_STABLE_BRANCH | awk -F. '{print $1}')
+			# get the highest release number in the stable branch line for this processor architecture
+			node_ver=$(curl -sL https://unofficial-builds.nodejs.org/download/release/index.tab | grep $ARM | grep -m 1 v$node_vnum | awk '{print $1}')
+			echo latest release in the $NODE_STABLE_BRANCH family for $ARM is $node_ver >> $logfile
+			curl -sL https://unofficial-builds.nodejs.org/download/release/$node_ver/node-$node_ver-linux-$ARM.tar.gz >node_release-$node_ver.tar.gz
+			cd /usr/local
+			echo using release tar file = node_release-$node_ver.tar.gz >> $logfile
+			sudo tar --strip-components 1 -xzf  $HOME/node_release-$node_ver.tar.gz
+			cd - >/dev/null
+			rm ./node_release-$node_ver.tar.gz
+		fi
+		# get the new node version number
+		new_ver=$(node -v 2>&1)
+		# if there is a failure to get it due to a missing library
+		if [ $(echo $new_ver | grep "not found" | wc -l) -ne 0 ]; then
+		  #
+			sudo apt-get install -y --only-upgrade libstdc++6 >> $logfile
+		fi
+		echo node version is $(node -v 2>&1 >>$logfile)
+	fi
+	echo -e "\e[92mNode.js installation Done! version=$(node -v)\e[0m" | tee -a $logfile
 fi
-
 # Check if we need to install or upgrade npm.
-echo -e "\e[96mCheck current NPM installation ...\e[0m"
+echo -e "\e[96mCheck current NPM installation ...\e[0m" | tee -a $logfile
 NPM_INSTALL=false
 if command_exists npm; then
-	echo -e "\e[0mNPM currently installed. Checking version number.";
+	echo -e "\e[0mNPM currently installed. Checking version number." | tee -a $logfile
 	NPM_CURRENT='V'$(npm -v)
-	echo -e "\e[0mMinimum npm version: \e[1m$NPM_TESTED\e[0m"
-	echo -e "\e[0mInstalled npm version: \e[1m$NPM_CURRENT\e[0m"
+	echo -e "\e[0mMinimum npm version: \e[1m$NPM_TESTED\e[0m" | tee -a $logfile
+	echo -e "\e[0mInstalled npm version: \e[1m$NPM_CURRENT\e[0m" | tee -a $logfile
 	if verlte $NPM_CURRENT $NPM_TESTED; then
-		echo -e "\e[96mnpm should be upgraded.\e[0m"
+		echo -e "\e[96mnpm should be upgraded.\e[0m" | tee -a $logfile
 		NPM_INSTALL=true
 
 		# Check if a node process is currently running.
 		# If so abort installation.
 		if pgrep "npm" > /dev/null; then
-			echo -e "\e[91mA npm process is currently running. Can't upgrade."
-			echo "Please quit all npm processes and restart the installer."
+			echo -e "\e[91mA npm process is currently running. Can't upgrade." | tee -a $logfile
+			echo "Please quit all npm processes and restart the installer." | tee -a $logfile
 			exit;
 		fi
 
 	else
-		echo -e "\e[92mNo npm upgrade necessary.\e[0m"
+		echo -e "\e[92mNo npm upgrade necessary.\e[0m" | tee -a $logfile
 	fi
 
 else
-	echo -e "\e[93mnpm is not installed.\e[0m";
+	echo -e "\e[93mnpm is not installed.\e[0m" | tee -a $logfile
 	NPM_INSTALL=true
 fi
 
 # Install or upgrade node if necessary.
 if $NPM_INSTALL; then
-	
-	echo -e "\e[96mInstalling npm ...\e[90m"
 
-  sudo apt-get install -y npm
-	echo -e "\e[92mnpm installation Done!\e[0m"
+	echo -e "\e[96mInstalling npm ...\e[90m" | tee -a $logfile
+
+	# Fetch the latest version of npm from the selected branch
+	# The NODE_STABLE_BRANCH variable will need to be manually adjusted when a new branch is released. (e.g. 7.x)
+	# Only tested (stable) versions are recommended as newer versions could break MagicMirror.
+
+	#NODE_STABLE_BRANCH="9.x"
+	#curl -sL https://deb.nodesource.com/setup_$NODE_STABLE_BRANCH | sudo -E bash -
+  #
+	# if this is a mac, npm was installed with node
+	if [ $mac != 'Darwin' ]; then
+		sudo apt-get install -y npm >>$logfile
+	fi
+	# update to the latest.
+	echo upgrading npm to latest >> $logfile
+	sudo npm i -g npm  >>$logfile
+	echo -e "\e[92mnpm installation Done! version=V$(npm -v)\e[0m" | tee -a $logfile
 fi
 
 # Install MagicMirror
 cd ~
-if [ -d "$HOME/MagicMirror" ] ; then
-	echo -e "\e[93mIt seems like MagicMirror is already installed."
-	echo -e "To prevent overwriting, the installer will be aborted."
-	echo -e "Please rename the \e[1m~/MagicMirror\e[0m\e[93m folder and try again.\e[0m"
-	echo ""
-	echo -e "If you want to upgrade your installation run \e[1m\e[97mgit pull\e[0m from the ~/MagicMirror directory."
-	echo ""
-	exit;
+if [ $doInstall == 1 ]; then
+	if [ -d "$HOME/MagicMirror" ] ; then
+		echo -e "\e[93mIt seems like MagicMirror is already installed." | tee -a $logfile
+		echo -e "To prevent overwriting, the installer will be aborted." | tee -a $logfile
+		echo -e "Please rename the \e[1m~/MagicMirror\e[0m\e[93m folder and try again.\e[0m" | tee -a $logfile
+		echo ""
+		echo -e "If you want to upgrade your installation run \e[1m\e[97mupgrade-script\e[0m from the ~/MagicMirror/installers directory." | tee -a $logfile
+		echo ""
+		exit;
+	fi
+
+	echo -e "\e[96mCloning MagicMirror ...\e[90m" | tee -a $logfile
+	if git clone --depth=1 https://github.com/MichMich/MagicMirror.git; then
+		echo -e "\e[92mCloning MagicMirror Done!\e[0m" | tee -a $logfile
+	else
+		echo -e "\e[91mUnable to clone MagicMirror." | tee -a $logfile
+		exit;
+	fi
+
+	cd ~/MagicMirror  || exit
+	if [ $(grep version package.json | awk -F: '{print $2}') == '"2.9.0",' -a $ARM == 'armv6l' ]; then
+	  git fetch https://github.com/MichMich/MagicMirror.git develop >/dev/null 2>&1
+		git branch develop FETCH_HEAD > /dev/null 2>&1
+		git checkout develop > /dev/null 2>&1
+	fi
+	echo -e "\e[96mInstalling dependencies ...\e[90m" | tee -a $logfile
+	if npm install $force_arch; then
+		echo -e "\e[92mDependencies installation Done!\e[0m" | tee -a $logfile
+	else
+		echo -e "\e[91mUnable to install dependencies!" | tee -a $logfile
+		exit;
+	fi
+
+	# Use sample config for start MagicMirror
+	echo setting up initial config.js | tee -a $logfile
+	cp config/config.js.sample config/config.js
 fi
-
-echo -e "\e[96mCloning MagicMirror ...\e[90m"
-if git clone --depth=1 https://github.com/MichMich/MagicMirror.git; then 
-	echo -e "\e[92mCloning MagicMirror Done!\e[0m"
-else
-	echo -e "\e[91mUnable to clone MagicMirror."
-	exit;
-fi
-
-cd ~/MagicMirror  || exit
-echo -e "\e[96mInstalling dependencies ...\e[90m"
-if npm install; then 
-	echo -e "\e[92mDependencies installation Done!\e[0m"
-else
-	echo -e "\e[91mUnable to install dependencies!"
-	exit;
-fi
-
-# Use sample config for start MagicMirror
-cp config/config.js.sample config/config.js
-
 # Check if plymouth is installed (default with PIXEL desktop environment), then install custom splashscreen.
-echo -e "\e[96mCheck plymouth installation ...\e[0m"
+echo -e "\e[96mCheck plymouth installation ...\e[0m" | tee -a $logfile
 if command_exists plymouth; then
 	THEME_DIR="/usr/share/plymouth/themes"
-	echo -e "\e[90mSplashscreen: Checking themes directory.\e[0m"
+	echo -e "\e[90mSplashscreen: Checking themes directory.\e[0m" | tee -a $logfile
 	if [ -d $THEME_DIR ]; then
-		echo -e "\e[90mSplashscreen: Create theme directory if not exists.\e[0m"
+		echo -e "\e[90mSplashscreen: Create theme directory if not exists.\e[0m" | tee -a $logfile
 		if [ ! -d $THEME_DIR/MagicMirror ]; then
 			sudo mkdir $THEME_DIR/MagicMirror
 		fi
 
 		if sudo cp ~/MagicMirror/splashscreen/splash.png $THEME_DIR/MagicMirror/splash.png && sudo cp ~/MagicMirror/splashscreen/MagicMirror.plymouth $THEME_DIR/MagicMirror/MagicMirror.plymouth && sudo cp ~/MagicMirror/splashscreen/MagicMirror.script $THEME_DIR/MagicMirror/MagicMirror.script; then
-			echo -e "\e[90mSplashscreen: Theme copied successfully.\e[0m"
-			if sudo plymouth-set-default-theme -R MagicMirror; then
-				echo -e "\e[92mSplashscreen: Changed theme to MagicMirror successfully.\e[0m"
-			else
-				echo -e "\e[91mSplashscreen: Couldn't change theme to MagicMirror!\e[0m"
+			echo
+			if [ "$(which plymouth-set-default-theme)." != "." ]; then
+				if sudo plymouth-set-default-theme -R MagicMirror; then
+					echo -e "\e[92mSplashscreen: Changed theme to MagicMirror successfully.\e[0m" | tee -a $logfile
+				else
+					echo -e "\e[91mSplashscreen: Couldn't change theme to MagicMirror!\e[0m" | tee -a $logfile
+				fi
 			fi
 		else
-			echo -e "\e[91mSplashscreen: Copying theme failed!\e[0m"
+			echo -e "\e[91mSplashscreen: Copying theme failed!\e[0m" | tee -a $logfile
 		fi
 	else
-		echo -e "\e[91mSplashscreen: Themes folder doesn't exist!\e[0m"
+		echo -e "\e[91mSplashscreen: Themes folder doesn't exist!\e[0m" | tee -a $logfile
 	fi
 else
-	echo -e "\e[93mplymouth is not installed.\e[0m";
+	echo -e "\e[93mplymouth is not installed.\e[0m" | tee -a $logfile
 fi
 
 # Use pm2 control like a service MagicMirror
 read -p "Do you want use pm2 for auto starting of your MagicMirror (y/N)?" choice
 if [[ $choice =~ ^[Yy]$ ]]; then
-    #
-    #  check if this is a mac
-    #
-    mac=$(uname -s)
-    up=""
-    if [ $mac == 'Darwin' ]; then 
-       up="--unsafe-perm"
-    fi
-    sudo npm install $up -g pm2
-	if [[ "$(ps --no-headers -o comm 1)" =~ systemd ]]; then #Checking for systemd
-		pm2 startup systemd -u $USER --hp /home/$USER
-	else
-		sudo su -c "env PATH=$PATH:/usr/bin pm2 startup linux -u $USER --hp /home/$USER"
-	fi
-  if [ "USER"  != "pi" ]; then 
-		sed 's/pi/'$USER'/g' mm.sh >mm.sh
-    sed 's/pi/'$USER'/g' $PM2_FILE > ~/MagicMirror/installers/pm2_MagicMirror_new.json
-    PM2_FILE=~/MagicMirror/installers/pm2_MagicMirror_new.json
-  fi
-	pm2 start $PM2_FILE 
-	pm2 save
+      echo install and setup pm2 | tee -a $logfile
+ 			# assume pm2 will be found on the path
+			pm2cmd=pm2
+			# check to see if already installed
+			pm2_installed=$(which $pm2cmd)
+			up=""
+			if [ $mac == 'Darwin' ]; then
+				 up="--unsafe-perm"
+				 launchctl=launchctl
+				 launchctl_path=$(which $launchctl)
+				 `export PATH=$PATH:${launchctl_path%/$launchctl}`
+			fi
+			# check to see if already installed
+			pm2_installed=$(which $pm2cmd)
+			if [  "$pm2_installed." != "." ]; then
+			    # does it work?
+					pm2_fails=$(pm2 list | grep -i -m 1 "App Name" | wc -l )
+					if [ $pm2_fails != 1 ]; then
+					   # uninstall it
+						 echo pm2 installed, but does not work, uninstalling >> $logfile
+					   sudo npm uninstall $up -g pm2 >> $logfile
+						 # force reinstall
+				     pm2_installed=
+					fi
+			fi
+			# if not installed
+			if [  "$pm2_installed." == "." ]; then
+				# install it.
+				echo pm2 not installed, installing >>$logfile
+				result=$(sudo npm install $up -g pm2 2>&1)
+				echo pm2 install result $result >>$logfile
+				# if this is a mac
+				if [ $mac == 'Darwin' ]; then
+					echo this is a mac, fixup for path >>$logfile
+					# get the location of pm2 install
+					# parse the npm install output to get the command
+					pm2cmd=`echo $result | awk -F -  '{print $1}' | tr -d '[:space:]'`
+					c='/pm2'
+					# get the path only
+					echo ${pm2cmd%$c} >installers/pm2path
+				fi
+			fi
+			echo get the pm2 platform specific startup command >>$logfile
+			# get the platform specific pm2 startup command
+			v=$($pm2cmd startup | tail -n 1)
+			if [ $mac != 'Darwin' ]; then
+				# check to see if we can get the OS package name (Ubuntu)
+				if [ $(which lsb_release| wc -l) >0 ]; then
+					# fix command
+					# if ubuntu 18.04, pm2 startup gets something wrong
+					if [ $(lsb_release  -r | grep -m1 18.04 | wc -l) > 0 ]; then
+						 v=$(echo $v | sed 's/\/bin/\/bin:\/bin/')
+					fi
+				fi
+			fi
+			echo startup command = $v >>$logfile
+			# execute the command returned
+		  $v 2>&1 >>$logfile
+			echo pm2 startup command done >>$logfile
+			# is this is mac
+			# need to fix pm2 startup, only on catalina
+			if [ $mac == 'Darwin' ];then
+        if [ $(sw_vers -productVersion | head -c 6) == '10.15.' ]; then
+					# only do if the faulty tag is present (pm2 may fix this, before the script is fixed)
+					if [ $(grep -m 1 UserName /Users/$USER/Library/LaunchAgents/pm2.$USER.plist | wc -l) -eq 1 ]; then
+						# copy the pm2 startup file config
+						cp  /Users/$USER/Library/LaunchAgents/pm2.$USER.plist .
+						# edit out the UserName key/value strings
+						sed -e '/UserName/{N;d;}' pm2.$USER.plist > pm2.$USER.plist.new
+						# copy the file back
+						sudo cp pm2.$USER.plist.new /Users/$USER/Library/LaunchAgents/pm2.$USER.plist
+					fi
+				fi
+			fi
+		# if the user is no pi, we have to fixup the pm2 json file
+		echo configure the pm2 config file for MagicMirror >>$logfile
+		if [ "$USER"  != "pi" ]; then
+			echo the user is not pi >>$logfile
+			# go to the installers folder`
+			cd installers
+			# edit the startup script for the right user
+			echo change mm.sh >>$logfile
+			 if [ ! -e mm_temp.sh ]; then
+			   echo save copy of mm.sh >> $logfile
+			   cp mm.sh mm_temp.sh
+			 fi
+			 if [ $(grep pi mm_temp.sh | wc -l) -gt 0 ]; then
+			  echo change hard coded pi username  >> $logfile
+				sed 's/pi/'$USER'/g' mm_temp.sh >mm.sh
+			 else
+			  echo change relative home path to hard coded path >> $logfile
+			  hf=$(echo $HOME |sed 's/\//\\\//g')
+			  sed 's/\~/'$hf'/g' mm_temp.sh >mm.sh
+			 fi
+			# edit the pms config file for the right user
+			echo change $PM2_FILE >>$logfile
+			sed 's/pi/'$USER'/g' $PM2_FILE > pm2_MagicMirror_new.json
+			# make sure to use the updated file
+			PM2_FILE=pm2_MagicMirror_new.json
+			# if this is a mac
+			if [ $mac == 'Darwin' ]; then
+				 # copy the path file to the system paths list
+				 sudo cp ./pm2path /etc/paths.d
+				 # change the name of the home path for mac
+				 sed 's/home/Users/g' $PM2_FILE > pm2_MagicMirror_new1.json
+				 # make sure to use the updated file
+				 PM2_FILE=pm2_MagicMirror_new1.json
+			fi
+			echo now using this config file $PM2_FILE >>$logfile
+			# go back one cd level
+			cd - >/dev/null
+		fi
+		echo start MagicMirror via pm2 now >>$logfile
+		# tell pm2 to start the app defined in the config file
+		$pm2cmd start $HOME/MagicMirror/installers/$PM2_FILE
+		# tell pm2 to save that configuration, for start at boot
+		echo save MagicMirror pm2 config now  >>$logfile
+		$pm2cmd save
+		pm2setup=$true
 fi
 # Disable Screensaver
-if [ -d "/etc/xdg/lxsession" ]; then
-	read -p "Do you want to disable the screen saver? (y/N)?" choice
-	if [[ $choice =~ ^[Yy]$ ]]; then
-		sudo su -c "echo -e '@xset s noblank\n@xset s off\n@xset -dpms' >> /etc/xdg/lxsession/LXDE-pi/autostart"
-		export DISPLAY=:0; xset s noblank;xset s off;xset -dpms
+choice=n
+read -p "Do you want to disable the screen saver? (y/N)?" choice
+if [[ $choice =~ ^[Yy]$ ]]; then
+  # if this is a mac
+	if [ $mac == 'Darwin' ]; then
+	  # get the current setting
+	  setting=$(defaults -currentHost read com.apple.screensaver idleTime)
+		# if its on
+		if [ $setting != 0 ] ; then
+		  # turn it off
+			echo disable screensaver via mac profile >> $logfile
+			defaults -currentHost write com.apple.screensaver idleTime 0
+		else
+			echo mac profile screen saver already disabled >> $logfile
+		fi
+	else
+	  # find out if some screen saver running
+
+		# get just the running processes and args
+		# just want the program name (1st token)
+		# find the 1st with 'saver' in it (should only be one)
+		# parse with path char, get the last field ( the actual pgm name)
+
+	  screen_saver_running=$(ps -A -o args | awk '{print $1}' | grep -m1 [s]aver | awk -F\/ '{print $NF}');
+
+		# if we found something
+		if [ "$screen_saver_running." != "." ]; then
+		  # some screensaver running
+			case "$screen_saver_running" in
+			 mate-screensaver) echo 'mate screen saver' >>$logfile
+			   #killall mate-screensaver >/dev/null 2>&1
+			   #$ms -d >/dev/null 2>&1
+						gsettings set org.mate.screensaver lock-enabled false	 2>/dev/null
+						gsettings set org.mate.screensaver idle-activation-enabled false	 2>/dev/null
+						gsettings set org.mate.screensaver lock_delay 0	 2>/dev/null
+				 echo " $screen_saver_running disabled" >> $logfile
+				 DISPLAY=:0  mate-screensaver  >/dev/null 2>&1 &
+				 ;;
+			 gnome-screensaver) echo 'gnome screen saver' >>$logfile
+			   gnome_screensaver-command -d >/dev/null 2>&1
+				 echo " $screen_saver_running disabled" >> $logfile
+			   ;;
+			 xscreensaver) echo 'xscreensaver running' | tee -a $logfile
+				 if [ $(grep -m1 'mode:' ~/.xscreensaver | awk '{print $2}') != 'off' ]; then
+					 sed -i 's/$xsetting/mode: off/' ~/.xscreensaver
+					 echo " xscreensaver set to off" >> $logfile
+				 else
+				   echo " xscreensaver already disabled" >> $logfile
+				 fi
+			   ;;
+			 gsd-screensaver | gsd-screensaver-proxy)
+					setting=$(gsettings get org.gnome.desktop.screensaver lock-enabled)
+					setting1=$(gsettings get org.gnome.desktop.session idle-delay)
+					if [ "$setting $setting1" != 'false uint32 0' ]; then
+						echo disable screensaver via gsettings was $setting and $setting1>> $logfile
+						gsettings set org.gnome.desktop.screensaver lock-enabled false
+						gsettings set org.gnome.desktop.screensaver idle-activation-enabled false
+						gsettings set org.gnome.desktop.session idle-delay 0
+					else
+						echo gsettings screen saver already disabled >> $logfile
+					fi
+					;;
+			 *) echo "some other screensaver $screen_saver_running" found | tee -a $logfile
+			    echo "please configure it manually" | tee -a $logfile
+			   ;;
+		  esac
+		elif [ -e "/etc/lightdm/lightdm.conf" ]; then
+		  # if screen saver NOT already disabled?
+			if [ $(grep 'xserver-command=X -s 0 -dpms' /etc/lightdm/lightdm.conf | wc -l) == 0 ]; then
+			  echo install screensaver via lightdm.conf >> $logfile
+				sudo sed -i '/^\[Seat:\*\]/a xserver-command=X -s 0 -dpms' /etc/lightdm/lightdm.conf
+			else
+			  echo screensaver via lightdm already disabled >> $logfile
+			fi
+		elif [ $(which gsettings | wc -l) == 1 ]; then
+			setting=$(gsettings get org.gnome.desktop.screensaver lock-enabled)
+			setting1=$(gsettings get org.gnome.desktop.session idle-delay)
+			if [ "$setting $setting1" != 'false uint32 0' ]; then
+			  echo disable screensaver via gsettings was $setting and $setting1>> $logfile
+				gsettings set org.gnome.desktop.screensaver lock-enabled false
+				gsettings set org.gnome.desktop.screensaver idle-activation-enabled false
+				gsettings set org.gnome.desktop.session idle-delay 0
+			else
+			  echo gsettings screen saver already disabled >> $logfile
+			fi
+		elif [ -d "/etc/xdg/lxsession" ]; then
+		  currently_set=$(grep -m1 '\-dpms' /etc/xdg/lxsession/LXDE-pi/autostart)
+			if [ "$currently_set." == "." ]; then
+				echo disable screensaver via lxsession >> $logfile
+				# turn it off for the future
+				sudo su -c "echo -e '@xset s noblank\n@xset s off\n@xset -dpms' >> /etc/xdg/lxsession/LXDE-pi/autostart"
+				# turn it off now
+				export DISPLAY=:0; xset s noblank;xset s off;xset -dpms
+			else
+			  echo lxsession screen saver already disabled >> $logfile
+			fi
+		else
+			echo " "
+			echo -e "unable to disable screen saver, /etc/xdg/lxsession does not exist" | tee -a $logfile
+		fi
 	fi
-else
-	echo " "
-	echo -e "unable to disable screen saver, /etc/xdg/lxsession does not exist"
 fi
+echo " "
+if [ $pm2setup -eq $true ]; then
+	rmessage="pm2 start MagicMirror"
+else
+  rmessage="DISPLAY=:0 npm start"
+fi
+echo -e "\e[92mWe're ready! Run \e[1m\e[97m$rmessage\e[0m\e[92m from the ~/MagicMirror directory to start your MagicMirror.\e[0m" | tee -a $logfile
 
-echo " "
-echo -e "\e[92mWe're ready! Run \e[1m\e[97mDISPLAY=:0 npm start\e[0m\e[92m from the ~/MagicMirror directory to start your MagicMirror.\e[0m"
 echo " "
 echo " "
+
+date +"install completed - %a %b %e %H:%M:%S %Z %Y" >>$logfile

installers/screensaveroff.sh

@@ -0,0 +1,101 @@
+#/bin/bash
+logfile=~/screensaver.log
+mac=$(uname -s)
+
+	if [ $mac == 'Darwin' ]; then
+	  setting=$(defaults -currentHost read com.apple.screensaver idleTime)
+		if [ $setting != 0 ] ; then
+			echo disable screensaver via mac profile >> $logfile
+			defaults -currentHost write com.apple.screensaver idleTime 0
+		else
+			echo mac profile screen saver already disabled >> $logfile
+		fi
+	else
+	  # find out if some screen saver running
+
+		# get just the running processes and args
+		# just want the program name
+		# find the 1st with 'saver' in it (should only be one)
+		# if the process name is a path, parse it and get the last field ( the actual pgm name)
+
+	  screen_saver_running=$(ps -A -o args | awk '{print $1}' | grep -m1 [s]aver | awk -F\/ '{print $NF}');
+
+		# if we found something
+		if [ "$screen_saver_running." != "." ]; then
+		  # some screensaver running
+			case "$screen_saver_running" in
+			 mate-screensaver) echo 'mate screen saver' >>$logfile
+			   #killall mate-screensaver >/dev/null 2>&1
+			   #ms=$(which mate-screensaver-command)
+			   #$ms -d >/dev/null 2>&1
+						gsettings set org.mate.screensaver lock-enabled false	 2>/dev/null
+						gsettings set org.mate.screensaver idle-activation-enabled false	 2>/dev/null
+						gsettings set org.mate.screensaver lock_delay 0	 2>/dev/null
+				 echo " $screen_saver_running disabled" >> $logfile
+				 DISPLAY=:0  mate-screensaver  >/dev/null 2>&1 &
+			   ;;
+			 gnome-screensaver) echo 'gnome screen saver' >>$logfile
+			   gnome_screensaver-command -d >/dev/null 2>&1
+				 echo " $screen_saver_running disabled" >> $logfile
+			   ;;
+			 xscreensaver) echo 'xscreensaver running' | tee -a $logfile
+				 if [ $(grep -m1 'mode:' ~/.xscreensaver | awk '{print $2}') != 'off' ]; then
+					 sed -i 's/$xsetting/mode: off/' ~/.xscreensaver
+					 echo " xscreensaver set to off" >> $logfile
+				 else
+				   echo " xscreensaver already disabled" >> $logfile
+				 fi
+			   ;;
+			 gsd-screensaver | gsd-screensaver-proxy)
+					setting=$(gsettings get org.gnome.desktop.screensaver lock-enabled)
+					setting1=$(gsettings get org.gnome.desktop.session idle-delay)
+					if [ "$setting $setting1" != 'false uint32 0' ]; then
+						echo disable screensaver via gsettings was $setting and $setting1>> $logfile
+						gsettings set org.gnome.desktop.screensaver lock-enabled false
+						gsettings set org.gnome.desktop.screensaver idle-activation-enabled false
+						gsettings set org.gnome.desktop.session idle-delay 0
+					else
+						echo gsettings screen saver already disabled >> $logfile
+					fi
+					;;
+			 *) echo "some other screensaver $screen_saver_running" found | tee -a $logfile
+			    echo "please configure it manually" | tee -a $logfile
+			   ;;
+		  esac
+		elif [ -e "/etc/lightdm/lightdm.conf" ]; then
+		  # if screen saver NOT already disabled?
+			if [ $(grep 'xserver-command=X -s 0 -dpms' /etc/lightdm/lightdm.conf | wc -l) == 0 ]; then
+			  echo install screensaver via lightdm.conf >> $logfile
+				sudo sed -i '/^\[Seat:\*\]/a xserver-command=X -s 0 -dpms' /etc/lightdm/lightdm.conf
+				#sudo cp _myconf /etc/lightdm/lightdm.conf
+				#rm _myconf >/dev/null
+			else
+			  echo screensaver via lightdm already disabled >> $logfile
+			fi
+		elif [ $(which gsettings | wc -l) == 1 ]; then
+			setting=$(gsettings get org.gnome.desktop.screensaver lock-enabled)
+			setting1=$(gsettings get org.gnome.desktop.session idle-delay)
+			if [ "$setting $setting1" != 'false uint32 0' ]; then
+			  echo disable screensaver via gsettings was $setting and $setting1>> $logfile
+				gsettings set org.gnome.desktop.screensaver lock-enabled false
+				gsettings set org.gnome.desktop.screensaver idle-activation-enabled false
+				gsettings set org.gnome.desktop.session idle-delay 0
+			else
+			  echo gsettings screen saver already disabled >> $logfile
+			fi
+		elif [ -d "/etc/xdg/lxsession" ]; then
+		  currently_set=$(grep -m1 '\-dpms' /etc/xdg/lxsession/LXDE-pi/autostart)
+			if [ "$currently_set." == "." ]; then
+				echo disable screensaver via lxsession >> $logfile
+				# turn it off for the future
+				sudo su -c "echo -e '@xset s noblank\n@xset s off\n@xset -dpms' >> /etc/xdg/lxsession/LXDE-pi/autostart"
+				# turn it off now
+				export DISPLAY=:0; xset s noblank;xset s off;xset -dpms
+			else
+			  echo lxsession screen saver already disabled >> $logfile
+			fi
+		else
+			echo " "
+			echo -e "unable to disable screen saver, /etc/xdg/lxsession does not exist" | tee >>$logfile
+		fi
+	fi

installers/upgrade-script.sh

@@ -0,0 +1,361 @@
+#!/bin/bash
+# only DO npm installs when flag is set to  1
+# test when set to 0
+true=1
+false=0
+doinstalls=$false
+force=$false
+justActive=$true
+test_run=$true
+stashed=$false 
+keyFile=package.json
+forced_arch=
+git_active_lock='./.git/index.lock'
+lf=$'\n'
+git_user_name=
+git_user_email=
+
+trim() {
+    local var="$*"
+    # remove leading whitespace characters
+    var="${var#"${var%%[![:space:]]*}"}"
+    # remove trailing whitespace characters
+    var="${var%"${var##*[![:space:]]}"}"   
+    echo -n "$var"
+}
+# is this a mac
+mac=$(uname -s)
+# get the processor architecture
+arch=$(uname -m)
+if [ $mac == 'Darwin' ]; then
+	cmd=greadlink
+else
+	cmd=readlink
+fi
+if [ -d ~/MagicMirror ]; then
+
+	# put the log where the script is located
+	logdir=$(dirname $($cmd -f "$0"))
+	# if the script was execute from the web
+	if [[ $logdir != *"MagicMirror/installers"* ]]; then
+		# use the MagicMirror/installers folder
+		cd ~/MagicMirror/installers >/dev/null
+		logdir=$(pwd)
+		cd - >/dev/null
+	fi
+	logfile=$logdir/upgrade.log
+  echo the log will be $logfile
+	echo  >>$logfile
+	date +"Upgrade started - %a %b %e %H:%M:%S %Z %Y" >>$logfile
+	echo system is $(uname -a) >> $logfile
+	echo the os is $(lsb_release -a) >> $logfile
+
+	# because of how its executed from the web, p0 gets overlayed with parm
+	# check to see if a parm was passed .. easy apply without  editing
+	p0=$0
+	# if not 'bash', and some parm specified
+	if [ $0 != 'bash' -a "$1." != "." ]; then
+		# then executed locally
+		# get the parm
+		p0=$1
+	fi
+	# lowercase it.. watch out, mac stuff doesn't work  with tr, etc
+	p0=$(echo $p0  | cut -c 1-5 |  awk '{print tolower($0)}' )
+	if [ $p0 == 'apply' ]; then
+		echo user requested to apply changes >>$logfile
+		doinstalls=$true
+		test_run=$false
+	elif [ $p0 == 'force' ]; then
+		echo user requested to force apply changes >>$logfile
+		doinstalls=$true
+		force=$true
+		test_run=$false	
+	fi
+
+	if [ $test_run == $true ]; then 
+		echo doing test run = true | tee -a $logfile
+	else
+		echo doing test run = false | tee -a $logfile
+	fi
+
+	# if we want just the modules listed in config.js now
+	if [ $justActive == $true ]; then 
+		 if [ ! -f ~/MagicMirror/installers/dumpactivemodules.js ]; then
+				echo downloading dumpactivemodules script >> $logfile
+				curl -sL https://www.dropbox.com/s/wwe6bfg2lcjmj43/dumpactivemodules.js?dl=0 > ~/MagicMirror/installers/dumpactivemodules.js
+		 fi
+	fi
+	echo update log will be in $logfile
+	# used for parsing the array of module names
+	SAVEIFS=$IFS   # Save current IFS
+	IFS=$'\n'   
+
+	echo | tee -a $logfile			
+	# if the git lock file exists and git is not running
+	if [ -f git_active_lock ]; then 
+		 # check to see if git is actually running
+		 git_running=`ps -ef | grep git | grep -v color | grep -v 'grep git' | wc -l`
+		 # if not running
+		 if [ git_running == $false ]; then 
+				# clean up the dangling lock file
+				echo erasing abandonded git lock file >> $logfile
+				rm git_active_lock >/dev/null 2>&1
+		 else
+				# git IS running, we can't proceed
+				echo it appears another instance of git is running | tee -a $logfile
+				# if this is an actual run 
+				if [ $doinstalls == $true ]; then 
+					# force it back to test run
+					doinstalls = $false
+					test_run=$true
+					echo forcing test run mode | tee -a $logfile
+					echo please resolve git running already and start the update again | tee -a $logfile
+				fi 
+		 fi
+	fi 
+	
+	# change to MagicMirror folder
+	cd ~/MagicMirror
+
+		# save custom.css
+		cd css 
+			echo "saving custom.css" | tee -a $logfile
+			cp -p custom.css save_custom.css
+		cd - >/dev/null
+		save_alias=$(alias git 2>/dev/null)
+		lang=$(locale | grep LANGUAGE | awk -F= '{print $2}')
+		# make sure git respones are in english, so code works
+		if [ "$lang." != "en_US.UTF-8." ]; then
+       echo not english or locale not set, set git alias >>$logfile	
+			 if [ "$LC_ALL." == "." ]; then
+					alias git='LANGUAGE=en_US.UTF-8 git' >>$logfile
+			 else
+					alias git='LC_ALL=en_US.UTF-8 git' >>$logfile
+			 fi
+			 #alias >>$logfile
+		fi
+		# get the git remote name 
+		remote=$(git remote 2>/dev/null | awk '{print $1}')	
+
+		# if remote name set
+		if [ "$remote." != "." ]; then 
+		
+			echo remote name = $remote >>$logfile
+			
+		  # get the local and remote package.json versions
+			local_version=$(grep -m1 version package.json | awk -F\" '{print $4}')
+			remote_version=$(curl -s https://raw.githubusercontent.com/MichMich/MagicMirror/master/package.json | grep -m1 version | awk -F\" '{print $4}')
+			
+			# only change if they are different
+			if [ "$local_version." != "$remote_version." -o $force == $true -o $test_run == $true ]; then 
+				echo upgrading from version $local_version to $remote_version | tee -a $logfile		
+		
+				# get the latest upgrade		
+				echo fetching latest revisions | tee -a $logfile
+				git fetch $remote >/dev/null 
+				rc=$?
+				echo git fetch rc=$rc >>$logfile
+				if [ $rc -eq 0 ]; then
+				
+					# need to get the current branch
+					current_branch=$(git branch | grep "*" | awk '{print $2}')
+					echo current branch = $current_branch >>$logfile
+					
+					git status 2>&1 >>$logfile
+					
+					# get the names of the files that are different locally
+					diffs=$(git status 2>&1 | grep modified | awk -F: '{print $2}')
+					
+					# split names into an array
+					diffs=($diffs) # split to array $diffs
+					
+					# if there are different files (array size greater than zero)
+					if [ ${#diffs[@]} -gt 0 ]; then   
+					  package_lock=0
+						echo there are "${#diffs[@]}" local files that are different than the master repo | tee -a $logfile
+						echo | tee -a $logfile
+						for file in "${diffs[@]}"
+						do 
+							echo "$file" | tee -a $logfile 
+							if [ $(echo $file | grep  '\-lock.json$' | wc -l) -eq 1 ]; then
+								package_lock=$true
+							fi
+						done
+						echo | tee -a $logfile
+						if [ $package_lock -eq 1 ]; then 
+							echo "any *-lock.json files do not need to be saved"
+						fi
+						read -p "do you want to save these files for later   (Y/n)?" choice 
+						echo save/restore files selection = $choice >> $logfile 					
+						if [[ $choice =~ ^[Yy]$ ]]; then 
+						  git_user=$(git config --global --get user.email)
+							if [ "git_user." == "." ]; then 
+							   git_user_name="-c user.name=upgrade_script"
+								 git_user_email="-c user.email=script@upgrade.com"
+							fi 
+							git git_user_name git_user_email stash >>$logfile
+							stashed=$true
+						else		
+							for file in "${diffs[@]}"
+							do
+								f="$(trim "$file")"
+								echo restoring $f from repo >> $logfile
+								if [ $test_run == $false ]; then 
+									git checkout HEAD -- $f | tee -a $logfile
+								else
+								  echo skipping restore for $f, doing test run | tee -a $logfile
+								fi 
+							done
+						fi 
+					else
+						echo no files different from github version >> $logfile
+					fi 
+
+					# lets test merge, in memory, no changes to working directory or local repo
+					test_merge_output=$(git merge-tree `git merge-base $current_branch HEAD` HEAD $current_branch | grep "^<<<<<<<\|changed in both")
+					echo "test merge result rc='$test_merge_output' , if empty, no conflicts" >> $logfile
+					
+					# if there were no conflicts reported
+					if [ "$test_merge_output." == "." ]; then 
+					
+						if [ $test_run == $false ]; then 
+							# go ahead and merge now						
+							echo "executing merge, apply specified" >> $logfile
+							# get the text output of merge
+							merge_output=$(git merge $remote/$current_branch 2>&1) 
+							# and its return code		
+							merge_result=$?		
+							# make any long line readable
+							merge_output=$(echo $merge_output | tr '|' '\n'| sed "s/create/\\${lf}create/g" | sed "s/mode\ change/\\${lf}mode\ change/g")
+							echo -e "merge result rc= $merge_result\n $merge_output">> $logfile							
+						else 
+						  echo "skipping merge, only test run" >> $logfile
+							merge_output=''
+							merge_result=0
+						fi 
+
+						# if no merge errors
+						if [ $merge_result == 0 ]; then 
+							# some updates applied
+							if [ "$merge_output." != 'Already up to date.' -o $test_run == $true ]; then
+								# update any dependencies for base
+								if [ $doinstalls == $true ]; then 
+								  # if this is a pi zero 
+									echo processor architecture is $arch >> $logfile
+									if [ "$arch" == "armv6l" ]; then 
+									   # force to look like pi 2
+										 echo forcing architecture armv7l >>$logfile
+										 forced_arch='--arch=armv7l'
+									fi 
+									echo "updating MagicMirror runtime, please wait" | tee -a $logfile
+									npm install $forced_arch 2>&1 | tee -a $logfile
+									done_update=`date +"completed - %a %b %e %H:%M:%S %Z %Y"`
+									echo npm install $done_update on base >> $ logfile
+								fi
+								# process updates for modules after base changed
+								cd modules			
+									if [ $justActive == $true ]; then
+										# get the list of ACTIVE modules with  package.json files
+										mtype=active
+										modules=$(node ../installers/dumpactivemodules.js) 
+									else
+										# get the list of INSTALLED modules with  package.json files
+										mtype=installed
+										modules=$(find  -maxdepth 2 -name 'package.json' -printf "%h\n" | cut -d'/' -f2 ) 
+									fi 
+									modules=($modules) # split to array $modules
+									
+									# if the array has entries in it
+									if [ ${#modules[@]} -gt  0 ]; then 
+									  echo >> $logfile
+										echo "processing dependency changes for $mtype modules with package.json files" | tee -a $logfile
+										echo
+										for module in "${modules[@]}" 
+										do
+											echo "processing for module" $module please wait | tee -a $logfile
+											echo '----------------------------------' | tee -a $logfile					
+											# change to that directory
+											cd  $module
+												# process its dependencies
+												if [ $doinstalls == $true ]; then
+													 npm install $forced_arch 2>&1| tee -a $logfile
+												else
+													echo skipped processing for $module, doing test run | tee -a $logfile													
+												fi
+											# return to modules folder
+											cd .. >/dev/null
+											echo "processing complete for module" $module | tee -a $logfile
+											echo
+										done
+									else 
+										echo "no modules found needing npm refresh" | tee -a $logfile
+									fi 
+								# return to Magic Mirror folder
+								cd .. >/dev/null
+							else
+								echo "no changes detected for modules, skipping " | tee -a $logfile				
+							fi
+						else
+							echo there were merge errors | tee -a $logfile
+							echo $merge_output | tee -a %logfile
+							echo you should examine and resolve them 	 | tee -a $logfile	
+							echo using the command git log --oneline --decorate | tee -a $logfile
+							git log --oneline --decorate | tee -a $logfile
+						fi 
+					else 
+						echo "there are merge conflicts to be resolved, no changes have been applied" | tee -a $logfile
+						echo $test_merge_output | tee -a $logfile
+					fi
+				else
+					echo "MagicMirror git fetch failed" | tee -a $logfile
+				fi
+			else
+			  echo "local version $local_version already same as master $remote_version" | tee -a $logfile
+			fi 
+		else
+		  echo "Unable to determine upstream git repository" | tee -a $logfile
+		fi
+		# should be in MagicMirror base
+		cd css
+			# restore  custom.css
+			echo "restoring custom.css" | tee -a $logfile
+			cp -p save_custom.css custom.css
+			rm save_custom.css
+		cd - >/dev/null
+		if [ "$lang." != "en_US.UTF-8." ]; then 		
+		   if [ "$save_alias." != "." ]; then 
+			    echo restoring git alias >>$logfile
+			    $save_alias >/dev/null
+			 else
+			    echo removing git alias >>$logfile
+			    unalias git >/dev/null
+			 fi 
+		fi
+	IFS=$SAVEIFS   # Restore IFS
+
+	if [ $stashed == $true ]; then 
+		 if [ $test_run == $true ]; then 
+			 echo test run, restoring files stashed | tee -a $logfile
+			 git git_user_name git_user_email stash pop  >> $logfile
+		 else	 
+			 echo we stashed a set of files that appear changed from the latest repo versions. you should review them | tee -a $logfile
+			 git stash show --name-only > installers/stashed_files
+			 echo see installers/stashed_files for the list 
+			 echo 
+			 echo you can use git checkout "stash@{0}" -- filename to extract one file from the stash 
+			 echo 
+			 echo or git stash pop to restore them all 
+			 echo
+			 echo WARNING..	 	 
+			 echo WARNING.. either will overlay the file just installed by the update
+			 echo WARNING..	 
+		 fi 
+	fi 
+	# return to original folder 
+	cd - >/dev/null
+	date +"Upgrade ended - %a %b %e %H:%M:%S %Z %Y" >>$logfile
+else 
+	echo It appears MagicMirror has not been installed on this system  
+	echo please run the installer, "raspberry.sh" first  
+fi 
+

js/app.js

@@ -11,6 +11,12 @@ var Utils = require(__dirname + "/utils.js");
 var defaultModules = require(__dirname + "/../modules/default/defaultmodules.js");
 var path = require("path");
 
+// Alias modules mentioned in package.js under _moduleAliases.
+require("module-alias/register");
+
+// add timestamps in front of log messages
+require("console-stamp")(console, "HH:MM:ss.l");
+
 // Get version number.
 global.version = JSON.parse(fs.readFileSync("package.json", "utf8")).version;
 console.log("Starting MagicMirror: v" + global.version);

js/main.js

@@ -39,11 +39,13 @@ var MM = (function() {
 			dom.opacity = 0;
 			wrapper.appendChild(dom);
 
-			if (typeof module.getHeader() !== "undefined" && module.getHeader() !== "") {
-				var moduleHeader = document.createElement("header");
-				moduleHeader.innerHTML = module.getHeader();
-				moduleHeader.className = "module-header";
-				dom.appendChild(moduleHeader);
+			var moduleHeader = document.createElement("header");
+			moduleHeader.innerHTML = module.getHeader();
+			moduleHeader.className = "module-header";
+			dom.appendChild(moduleHeader);
+
+			if (typeof module.getHeader() === "undefined" || module.getHeader() !== "") {
+				moduleHeader.style = "display: none;";
 			}
 
 			var moduleContent = document.createElement("div");
@@ -210,9 +212,8 @@ var MM = (function() {
 		contentWrapper[0].innerHTML = "";
 		contentWrapper[0].appendChild(newContent);
 
-		if( headerWrapper.length > 0 && newHeader) {
-			headerWrapper[0].innerHTML = newHeader;
-		}
+		headerWrapper[0].innerHTML = newHeader;
+		headerWrapper[0].style = headerWrapper.length > 0 && newHeader ? undefined : "display: none;";
 	};
 
 	/* hideModule(module, speed, callback)

js/node_helper.js

@@ -5,7 +5,7 @@
  * MIT Licensed.
  */
 
-var Class = require("../../../js/class.js");
+var Class = require("./class.js");
 var express = require("express");
 var path = require("path");
 

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"));

modules/default/calendar/calendar.js

@@ -180,6 +180,7 @@ Module.register("calendar", {
 
 					dateCell.colSpan = "3";
 					dateCell.innerHTML = dateAsString;
+					dateCell.style.paddingTop = "10px";
 					dateRow.appendChild(dateCell);
 					wrapper.appendChild(dateRow);
 

modules/default/calendar/calendarfetcher.js

@@ -306,6 +306,11 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
 							continue;
 						}
 
+						// adjust start date so multiple day events will be displayed as happening today even though they started some days ago already
+						if (fullDayEvent && startDate <= today) {
+							startDate = moment(today);
+						}
+
 						// Every thing is good. Add it to the list.
 
 						newEvents.push({
@@ -355,7 +360,7 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
 	 * return bool - The event is a fullday event.
 	 */
 	var isFullDayEvent = function(event) {
-		if (event.start.length === 8) {
+		if (event.start.length === 8 || event.start.dateOnly) {
 			return true;
 		}
 

modules/default/calendar/debug.js

@@ -24,7 +24,7 @@ var auth = {
 
 console.log("Create fetcher ...");
 
-fetcher = new CalendarFetcher(url, fetchInterval, maximumEntries, maximumNumberOfDays, auth);
+fetcher = new CalendarFetcher(url, fetchInterval, [], maximumEntries, maximumNumberOfDays, auth);
 
 fetcher.onReceive(function(fetcher) {
 	console.log(fetcher.events());
@@ -38,4 +38,4 @@ fetcher.onError(function(fetcher, error) {
 
 fetcher.startFetch();
 
-console.log("Create fetcher done! ");
+console.log("Create fetcher done! ");

modules/default/compliments/compliments.js

@@ -36,9 +36,10 @@ Module.register("compliments", {
 		morningStartTime: 3,
 		morningEndTime: 12,
 		afternoonStartTime: 12,
-		afternoonEndTime: 17
+		afternoonEndTime: 17,
+		random: true
 	},
-
+  lastIndexUsed:-1,
 	// Set currentweather from module
 	currentWeatherType: "",
 
@@ -147,19 +148,43 @@ Module.register("compliments", {
 	 * return compliment string - A compliment.
 	 */
 	randomCompliment: function() {
+		// get the current time of day compliments list
 		var compliments = this.complimentArray();
-		var index = this.randomIndex(compliments);
+		// variable for index to next message to display
+		let index=0
+		// are we randomizing
+		if(this.config.random){
+			// yes
+			index = this.randomIndex(compliments);
+		}
+		else{
+			// no, sequetial
+			// if doing sequential,  don't fall off the end
+			index = (this.lastIndexUsed >= (compliments.length-1))?0: ++this.lastIndexUsed
+		}
 
 		return compliments[index];
 	},
 
-	// Override dom generator.
+// Override dom generator.
 	getDom: function() {
-		var complimentText = this.randomCompliment();
-
-		var compliment = document.createTextNode(complimentText);
 		var wrapper = document.createElement("div");
 		wrapper.className = this.config.classes ? this.config.classes : "thin xlarge bright pre-line";
+		// get the compliment text 
+		var complimentText = this.randomCompliment();
+		// split it into parts on newline text 
+		var parts= complimentText.split('\n')
+		// create a span to hold it all
+		var compliment=document.createElement('span')
+                // process all the parts of the compliment text
+		for (part of parts){
+			// create a text element for each part
+			compliment.appendChild(document.createTextNode(part))
+			// add a break `
+			compliment.appendChild(document.createElement('BR'))
+		}
+		// remove the last break
+		compliment.lastElementChild.remove();
 		wrapper.appendChild(compliment);
 
 		return wrapper;

modules/default/weatherforecast/weatherforecast.js

@@ -180,9 +180,9 @@ Module.register("weatherforecast",{
 					rainCell.innerHTML = "";
 				} else {
 					if(config.units !== "imperial") {
-						rainCell.innerHTML = parseFloat(forecast.rain).toFixed(1) + " mm";
+						rainCell.innerHTML = parseFloat(forecast.rain).toFixed(1).replace(".", this.config.decimalSymbol) + " mm";
 					} else {
-						rainCell.innerHTML = (parseFloat(forecast.rain) / 25.4).toFixed(2) + " in";
+						rainCell.innerHTML = (parseFloat(forecast.rain) / 25.4).toFixed(2).replace(".", this.config.decimalSymbol) + " in";
 					}
 				}
 				rainCell.className = "align-right bright rain";

package.json

@@ -1,10 +1,10 @@
 {
   "name": "magicmirror",
-  "version": "2.9.0",
+  "version": "2.10.1",
   "description": "The open source modular smart mirror platform.",
   "main": "js/electron.js",
   "scripts": {
-    "start": "sh run-start.sh",
+    "start": "./run-start.sh",
     "install": "cd vendor && npm install",
     "install-fonts": "cd fonts && npm install",
     "postinstall": "sh untrack-css.sh && sh installers/postinstall/postinstall.sh && npm run install-fonts",
@@ -55,15 +55,19 @@
     "stylelint-config-standard": "latest",
     "time-grunt": "latest"
   },
+  "optionalDependencies": {
+    "electron": "^3.0.13"
+  },
   "dependencies": {
     "colors": "^1.1.2",
-    "electron": "^3.0.13",
+    "console-stamp": "^0.2.9",
     "express": "^4.16.2",
     "express-ipfilter": "^1.0.1",
     "feedme": "latest",
-    "helmet": "^3.9.0",
+    "helmet": "^3.21.2",
     "iconv-lite": "latest",
-    "lodash": "^4.17.11",
+    "lodash": "^4.17.15",
+    "module-alias": "^2.2.2",
     "moment": "latest",
     "request": "^2.88.0",
     "rrule": "^2.6.2",
@@ -71,5 +75,8 @@
     "simple-git": "^1.85.0",
     "socket.io": "^2.1.1",
     "valid-url": "latest"
+  },
+  "_moduleAliases": {
+    "node_helper": "js/node_helper.js"
   }
 }

run-start.sh

@@ -1,7 +1,67 @@
-
+#!/bin/bash
+  # use bash instead of sh
 ./untrack-css.sh
 
 if [ -z "$DISPLAY" ]; then #If not set DISPLAY is SSH remote or tty
 	export DISPLAY=:0 # Set by default display
 fi
-electron js/electron.js $1
+# get the processor architecture
+arch=$(uname -m)
+false='false'
+
+# 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}
+# check for xwindows running
+xorg=$(pgrep Xorg)
+#check for macOS
+mac=$(uname)
+#
+# if the user requested serveronly OR 
+#    electron support for armv6l has been dropped OR
+#    system is in text mode
+#
+if [ "$serveronly." != "false." -o  "$arch" == "armv6l" ] ||  [ "$xorg." == "." -a $mac != 'Darwin' ]; then
+
+	# if user explicitly configured to run server only (no ui local)
+	# OR there is no xwindows running, so no support for browser graphics
+	if [ "$serveronly." == "true." -o "$xorg." == "." ]; then
+	  # start server mode, 
+	  node serveronly
+	else 
+		# start the server in the background
+		# wait for server to be ready
+		# need bash for this
+		exec 3< <(node serveronly)
+
+		# Read the output of server line by line until one line 'point your browser'
+		while read line; do
+			 case "$line" in
+			 *point\ your\ browser*)
+					echo $line 
+					break
+					;;
+			 *)
+					echo $line
+					#sleep .25
+					;;
+			 esac
+		done <&3
+
+		# Close the file descriptor
+		exec 3<&-	
+
+		# lets use chrome to display here now
+		# get the server port address from the ready message
+		port=$(echo $line | awk -F\: '{print $4}')	
+		# start chromium 
+		echo "Starting chromium browser now, have patience, it takes a minute"
+		chromium-browser -noerrdialogs -kiosk -start_maximized  --disable-infobars --app=http://localhost:$port  --ignore-certificate-errors-spki-list --ignore-ssl-errors --ignore-certificate-errors 2>/dev/null
+		exit		  
+	fi 
+else  
+	# we can use electron directly	
+	electron js/electron.js $1;
+fi

tests/e2e/modules/weather_spec.js

@@ -173,98 +173,98 @@ describe("Weather module", function() {
 	});
 
 	describe("Weather Forecast", function() {
-        let template;
+		let template;
 
-        before(function() {
-            template = fs.readFileSync(path.join(__dirname, "..", "..", "..", "modules", "default", "weather", "forecast.njk"), "utf8");
-        });
+		before(function() {
+			template = fs.readFileSync(path.join(__dirname, "..", "..", "..", "modules", "default", "weather", "forecast.njk"), "utf8");
+		});
 
-        describe("Default configuration", function() {
-            before(function() {
-                process.env.MM_CONFIG_FILE = "tests/configs/modules/weather/forecastweather_default.js";
-            });
+		describe("Default configuration", function() {
+			before(function() {
+				process.env.MM_CONFIG_FILE = "tests/configs/modules/weather/forecastweather_default.js";
+			});
 
-            it("should render days", async function() {
-                const weather = generateWeatherForecast();
-                await setup([weather, template]);
+			it("should render days", async function() {
+				const weather = generateWeatherForecast();
+				await setup([weather, template]);
 
-                const days = ["Fri", "Sat", "Sun", "Mon", "Tue"];
+				const days = ["Fri", "Sat", "Sun", "Mon", "Tue"];
 
-                for (const [index, day] of days.entries()) {
-                    await app.client.waitUntilTextExists(`.weather table.small tr:nth-child(${index + 1}) td:nth-child(1)`, day, 10000);
-                }
-            });
+				for (const [index, day] of days.entries()) {
+					await app.client.waitUntilTextExists(`.weather table.small tr:nth-child(${index + 1}) td:nth-child(1)`, day, 10000);
+				}
+			});
 
-            it("should render icons", async function() {
-                const weather = generateWeatherForecast();
-                await setup([weather, template]);
+			it("should render icons", async function() {
+				const weather = generateWeatherForecast();
+				await setup([weather, template]);
 
-                const icons = ["day-cloudy", "rain", "day-sunny", "day-sunny", "day-sunny"];
+				const icons = ["day-cloudy", "rain", "day-sunny", "day-sunny", "day-sunny"];
 
-                for (const [index, icon] of icons.entries()) {
-                    await app.client.waitForExist(`.weather table.small tr:nth-child(${index + 1}) td:nth-child(2) span.wi-${icon}`, 10000);
-                }
-            });
+				for (const [index, icon] of icons.entries()) {
+					await app.client.waitForExist(`.weather table.small tr:nth-child(${index + 1}) td:nth-child(2) span.wi-${icon}`, 10000);
+				}
+			});
 
-            it("should render max temperatures", async function() {
-                const weather = generateWeatherForecast();
-                await setup([weather, template]);
+			it("should render max temperatures", async function() {
+				const weather = generateWeatherForecast();
+				await setup([weather, template]);
 
-                const temperatures = ["24.4°", "21.0°", "22.9°", "23.4°", "20.6°"];
+				const temperatures = ["24.4°", "21.0°", "22.9°", "23.4°", "20.6°"];
 
-                for (const [index, temp] of temperatures.entries()) {
-                    await app.client.waitUntilTextExists(`.weather table.small tr:nth-child(${index + 1}) td:nth-child(3)`, temp, 10000);
-                }
-            });
+				for (const [index, temp] of temperatures.entries()) {
+					await app.client.waitUntilTextExists(`.weather table.small tr:nth-child(${index + 1}) td:nth-child(3)`, temp, 10000);
+				}
+			});
 
-            it("should render min temperatures", async function() {
-                const weather = generateWeatherForecast();
-                await setup([weather, template]);
+			it("should render min temperatures", async function() {
+				const weather = generateWeatherForecast();
+				await setup([weather, template]);
 
-                const temperatures = ["15.3°", "13.6°", "13.8°", "13.9°", "10.9°"];
+				const temperatures = ["15.3°", "13.6°", "13.8°", "13.9°", "10.9°"];
 
-                for (const [index, temp] of temperatures.entries()) {
-                    await app.client.waitUntilTextExists(`.weather table.small tr:nth-child(${index + 1}) td:nth-child(4)`, temp, 10000);
-                }
-            });
+				for (const [index, temp] of temperatures.entries()) {
+					await app.client.waitUntilTextExists(`.weather table.small tr:nth-child(${index + 1}) td:nth-child(4)`, temp, 10000);
+				}
+			});
 
-            it("should render fading of rows", async function() {
-                const weather = generateWeatherForecast();
-                await setup([weather, template]);
+			it("should render fading of rows", async function() {
+				const weather = generateWeatherForecast();
+				await setup([weather, template]);
 
-                const opacities = [1, 1, 0.8, 0.5333333333333333, 0.2666666666666667];
+				const opacities = [1, 1, 0.8, 0.5333333333333333, 0.2666666666666667];
 
-                await app.client.waitForExist('.weather table.small', 10000);
+				await app.client.waitForExist(".weather table.small", 10000);
 
-                for (const [index, opacity] of opacities.entries()) {
-                    const html = await app.client.getHTML(`.weather table.small tr:nth-child(${index + 1})`);
-                    expect(html).to.includes(`<tr style="opacity: ${opacity};">`);
-                }
-            });
-        });
+				for (const [index, opacity] of opacities.entries()) {
+					const html = await app.client.getHTML(`.weather table.small tr:nth-child(${index + 1})`);
+					expect(html).to.includes(`<tr style="opacity: ${opacity};">`);
+				}
+			});
+		});
 
-        describe("Configuration Options", function() {
-            before(function() {
-                process.env.MM_CONFIG_FILE = "tests/configs/modules/weather/forecastweather_options.js";
-            });
+		describe("Configuration Options", function() {
+			before(function() {
+				process.env.MM_CONFIG_FILE = "tests/configs/modules/weather/forecastweather_options.js";
+			});
 
-            it("should render custom table class", async function() {
-                const weather = generateWeatherForecast();
-                await setup([weather, template]);
+			it("should render custom table class", async function() {
+				const weather = generateWeatherForecast();
+				await setup([weather, template]);
 
-                await app.client.waitForExist(`.weather table.myTableClass`, 10000);
-            });
+				await app.client.waitForExist(".weather table.myTableClass", 10000);
+			});
 
-            it("should render colored rows", async function() {
-                const weather = generateWeatherForecast();
-                await setup([weather, template]);
+			it("should render colored rows", async function() {
+				const weather = generateWeatherForecast();
+				await setup([weather, template]);
 
-                await app.client.waitForExist(`.weather table.myTableClass`, 10000);
+				await app.client.waitForExist(".weather table.myTableClass", 10000);
 
-                const rows = await app.client.$$('.weather table.myTableClass tr.colored');
+				const rows = await app.client.$$(".weather table.myTableClass tr.colored");
 
-                expect(rows.length).to.be.equal(5);
-            });
-        });
-    });
+				expect(rows.length).to.be.equal(5);
+			});
+		});
+	});
 });

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}`);						
 				});
 			});
 		});

untrack-css.sh

@@ -1,6 +1,6 @@
 # Long history here
 # https://github.com/MichMich/MagicMirror/pull/1540
-STATUS_CUSTOM_CSS=$(git ls-files -v css/custom.css|cut -f 1 --delimiter=" ")
+STATUS_CUSTOM_CSS=$(git ls-files -v css/custom.css| awk '{print $1}')
 
 if [ "$STATUS_CUSTOM_CSS" = "H" ]; then
   echo "We'll remove from the repository the css/custom.css"

vendor/package-lock.json

@@ -5,7 +5,7 @@
   "dependencies": {
     "@fortawesome/fontawesome-free": {
       "version": "5.6.3",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.6.3.tgz",
+      "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.6.3.tgz",
       "integrity": "sha512-s5PLdI9NYgjBvfrv6rhirPHlAHWx+Sfo/IjsAeiXYfmemC/GSjwsyz1wLnGPazbLPXWfk62ks980o9AmsxYUEQ=="
     },
     "a-sync-waterfall": {