Merge pull request #32 from MichMich/develop

sync Develop

CHANGELOG.md

@@ -3,6 +3,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+
+## Updated
+- fix handling of config.js for serverOnly mode commented out
+- only check for xwindows running if not on macOS
+
 ### Added 
 - move node_helper module to dedicated github repo, to prevent being erased accidentally
 
@@ -13,6 +18,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - 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
 - 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.
@@ -21,11 +27,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 *This release is scheduled to be released on 2020-01-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).
+
 ### Added
 - Timestamps in log output
 - Padding in dateheader mode of the calendar module 
 
 ### Updated
+- Updated lower bound of `lodash` and `helmet` dependencies for security patches.
 
 ### Fixed
 - Fixed issue in weatherforecast module where predicted amount of rain was not using the decimal symbol specified in config.js.

installers/fixuppm2.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # 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=pm2_MagicMirror.json
@@ -22,7 +22,14 @@ if [ -d ~/MagicMirror ]; then
 		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
@@ -105,10 +112,25 @@ if [ -d ~/MagicMirror ]; then
 					fi 
 				fi
 			fi 
-			echo command = $v >>$logfile
+			echo startup command = $v >>$logfile
 			# execute the command returned				
-		  $v 2>/dev/null >>$logfile
-			echo pm2 startup done >>$logfile
+		  $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

installers/raspberry.sh

@@ -3,6 +3,11 @@
 # 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 '$$$\    $$$ |                    \__|          $$$\    $$$ |\__|                                        $$  __$$\'
@@ -21,7 +26,7 @@ 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=pm2_MagicMirror.json
@@ -37,6 +42,8 @@ trim() {
     echo -n "$var"
 }
 
+
+
 mac=$(uname -s)
 if [ $mac == 'Darwin' ]; then
   echo this is a mac | tee -a $logfile
@@ -67,6 +74,7 @@ echo install log being saved to $logfile
 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
@@ -74,13 +82,13 @@ if [ "$ARM" != "armv7l" ]; 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, you are in the same boat as the original Raspberry Pi. You must run in server only mode."
+		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
 fi
 
 # Define helper methods.
@@ -90,14 +98,38 @@ function verlt() { [ "$1" = "$2" ] && return 1 || verlte $1 $2 ;}
 
 # Update before first apt-get
 if [ $mac != 'Darwin' ]; then
-echo -e "\e[96mUpdating packages ...\e[90m" | tee -a $logfile
-sudo apt-get update || echo -e "\e[91mUpdate failed, carrying on installation ...\e[90m" | tee -a $logfile
-fi
+	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
 
-if [ $mac != 'Darwin' ]; then
-# 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
+	# 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.
@@ -106,6 +138,10 @@ NODE_INSTALL=false
 if command_exists node; then
 	echo -e "\e[0mNode currently installed. Checking version number." | tee -a $logfile
 	NODE_CURRENT=$(node -v)
+	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
@@ -117,6 +153,7 @@ if command_exists node; then
 		if pgrep "node" > /dev/null; then
 			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
 
@@ -128,7 +165,6 @@ else
 	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
 
@@ -141,12 +177,38 @@ if $NODE_INSTALL; 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 --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" | tee -a $logfile
 NPM_INSTALL=false
@@ -190,11 +252,11 @@ if $NPM_INSTALL; then
   #
 	# if this is a mac, npm was installed with node
 	if [ $mac != 'Darwin' ]; then
-		sudo apt-get install -y npm
+		sudo apt-get install -y npm >>$logfile
 	fi
 	# update to the latest.
 	echo upgrading npm to latest >> $logfile
-	sudo npm i -g npm 
+	sudo npm i -g npm  >>$logfile
 	echo -e "\e[92mnpm installation Done! version=V$(npm -v)\e[0m" | tee -a $logfile
 fi
 
@@ -206,7 +268,7 @@ if [ $doInstall == 1 ]; then
 		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[97mgit pull\e[0m from the ~/MagicMirror directory." | tee -a $logfile
+		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
@@ -220,6 +282,11 @@ if [ $doInstall == 1 ]; then
 	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
@@ -244,12 +311,14 @@ if command_exists plymouth; then
 		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" | tee -a $logfile
+			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" | tee -a $logfile
 		fi
@@ -292,7 +361,7 @@ if [[ $choice =~ ^[Yy]$ ]]; then
 			if [  "$pm2_installed." == "." ]; then
 				# install it.
 				echo pm2 not installed, installing >>$logfile
-				result=$(sudo npm install $up -g pm2)
+				result=$(sudo npm install $up -g pm2 2>&1)
 				echo pm2 install result $result >>$logfile
 				# if this is a mac
 				if [ $mac == 'Darwin' ]; then
@@ -322,7 +391,21 @@ if [[ $choice =~ ^[Yy]$ ]]; then
 			# 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
@@ -436,16 +519,13 @@ if [[ $choice =~ ^[Yy]$ ]]; then
 			    echo "please configure it manually" | tee -a $logfile
 			   ;;
 		  esac
-		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
+		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 lxsession screen saver already disabled >> $logfile
+			  echo screensaver via lightdm already disabled >> $logfile
 			fi
 		elif [ $(which gsettings | wc -l) == 1 ]; then
 			setting=$(gsettings get org.gnome.desktop.screensaver lock-enabled)
@@ -458,13 +538,16 @@ if [[ $choice =~ ^[Yy]$ ]]; then
 			else
 			  echo gsettings screen saver already disabled >> $logfile
 			fi
-		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 
+		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 screensaver via lightdm already disabled >> $logfile 
+			  echo lxsession screen saver already disabled >> $logfile
 			fi
 		else
 			echo " "

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

@@ -44,10 +44,11 @@ if [ -d ~/MagicMirror ]; then
 		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
@@ -81,7 +82,7 @@ if [ -d ~/MagicMirror ]; then
 	if [ $justActive == $true ]; then 
 		 if [ ! -f ~/MagicMirror/installers/dumpactivemodules.js ]; then
 				echo downloading dumpactivemodules script >> $logfile
-		curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/develop/installers/dumpactivemodules.js > ~/MagicMirror/installers/dumpactivemodules.js
+				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
@@ -151,13 +152,16 @@ if [ -d ~/MagicMirror ]; then
 		
 				# get the latest upgrade		
 				echo fetching latest revisions | tee -a $logfile
-				
-				if git fetch $remote; then
+				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
+					
+					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}')
@@ -238,11 +242,11 @@ if [ -d ~/MagicMirror ]; then
 								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 
+									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"`

package-lock.json

@@ -14,15 +14,15 @@
       }
     },
     "@babel/core": {
-      "version": "7.7.5",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.7.5.tgz",
-      "integrity": "sha512-M42+ScN4+1S9iB6f+TL7QBpoQETxbclx+KNoKJABghnKYE+fMzSGqst0BZJc8CpI625bwPwYgUyRvxZ+0mZzpw==",
+      "version": "7.7.7",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.7.7.tgz",
+      "integrity": "sha512-jlSjuj/7z138NLZALxVgrx13AOtqip42ATZP7+kYl53GvDV6+4dCek1mVUo8z8c8Xnw/mx2q3d9HWh3griuesQ==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.5.5",
-        "@babel/generator": "^7.7.4",
+        "@babel/generator": "^7.7.7",
         "@babel/helpers": "^7.7.4",
-        "@babel/parser": "^7.7.5",
+        "@babel/parser": "^7.7.7",
         "@babel/template": "^7.7.4",
         "@babel/traverse": "^7.7.4",
         "@babel/types": "^7.7.4",
@@ -53,12 +53,6 @@
             "minimist": "^1.2.0"
           }
         },
-        "lodash": {
-          "version": "4.17.15",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
-          "dev": true
-        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -66,9 +60,9 @@
           "dev": true
         },
         "resolve": {
-          "version": "1.13.1",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.13.1.tgz",
-          "integrity": "sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w==",
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.14.1.tgz",
+          "integrity": "sha512-fn5Wobh4cxbLzuHaE+nphztHy43/b++4M6SsGFC2gB8uYwf0C8LcarfCz1un7UTW8OFQg9iNjZ4xpcFVGebDPg==",
           "dev": true,
           "requires": {
             "path-parse": "^1.0.6"
@@ -83,9 +77,9 @@
       }
     },
     "@babel/generator": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.4.tgz",
-      "integrity": "sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==",
+      "version": "7.7.7",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.7.tgz",
+      "integrity": "sha512-/AOIBpHh/JU1l0ZFS4kiRCBnLi6OTHzh0RPk3h9isBxkkqELtQNFi1Vr/tiG9p1yfoUdKVwISuXWQR+hwwM4VQ==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.7.4",
@@ -94,12 +88,6 @@
         "source-map": "^0.5.0"
       },
       "dependencies": {
-        "lodash": {
-          "version": "4.17.15",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
-          "dev": true
-        },
         "source-map": {
           "version": "0.5.7",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -197,15 +185,15 @@
       }
     },
     "@babel/parser": {
-      "version": "7.7.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.5.tgz",
-      "integrity": "sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==",
+      "version": "7.7.7",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.7.tgz",
+      "integrity": "sha512-WtTZMZAZLbeymhkd/sEaPD8IQyGAhmuTuvTzLiCFM7iXiVdY0gc0IaI+cW0fh1BnSMbJSzXX6/fHllgHKwHhXw==",
       "dev": true
     },
     "@babel/runtime": {
-      "version": "7.7.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.7.6.tgz",
-      "integrity": "sha512-BWAJxpNVa0QlE5gZdWjSxXtemZyZ9RmrmVozxt3NUXeZhVIJ5ANyqmMc0JDrivBZyxUuQvFxlvH4OWWOogGfUw==",
+      "version": "7.7.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.7.7.tgz",
+      "integrity": "sha512-uCnC2JEVAu8AKB5do1WRIsvrdJ0flYx/A/9f/6chdacnEZ7LmavjdsDXr5ksYBegxtuTPR5Va9/+13QF/kFkCA==",
       "dev": true,
       "requires": {
         "regenerator-runtime": "^0.13.2"
@@ -262,12 +250,6 @@
           "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
           "dev": true
         },
-        "lodash": {
-          "version": "4.17.15",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
-          "dev": true
-        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -285,14 +267,6 @@
         "esutils": "^2.0.2",
         "lodash": "^4.17.13",
         "to-fast-properties": "^2.0.0"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.15",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
-          "dev": true
-        }
       }
     },
     "@mrmlnc/readdir-enhanced": {
@@ -337,9 +311,9 @@
           }
         },
         "lodash": {
-          "version": "4.17.4",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-          "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
           "dev": true
         }
       }
@@ -408,12 +382,6 @@
       "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
       "dev": true
     },
-    "@types/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
-      "dev": true
-    },
     "@types/unist": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz",
@@ -487,15 +455,6 @@
       "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
       "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8="
     },
-    "agent-base": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.0.tgz",
-      "integrity": "sha512-c+R/U5X+2zz2+UCrCFv6odQzJdoqI+YecuhnAJLa1zYaMc13zPfwMwZrr91Pd1DYNo/yPRbiM4WVf9whgwFsIg==",
-      "dev": true,
-      "requires": {
-        "es6-promisify": "^5.0.0"
-      }
-    },
     "ajv": {
       "version": "6.5.5",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.5.tgz",
@@ -1139,6 +1098,11 @@
         }
       }
     },
+    "bowser": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.7.0.tgz",
+      "integrity": "sha512-aIlMvstvu8x+34KEiOHD3AsBgdrzg6sxALYiukOWhFvGMbQI6TRP/iY0LMhUrHs56aD6P1G0Z7h45PUJaa5m9w=="
+    },
     "brace-expansion": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
@@ -1292,9 +1256,9 @@
       "integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs="
     },
     "caniuse-lite": {
-      "version": "1.0.30001015",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001015.tgz",
-      "integrity": "sha512-/xL2AbW/XWHNu1gnIrO8UitBGoFthcsDgU9VLK1/dpsoxbaD5LscHozKze05R6WLsBvLhqv78dAPozMFQBYLbQ==",
+      "version": "1.0.30001017",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001017.tgz",
+      "integrity": "sha512-EDnZyOJ6eYh6lHmCvCdHAFbfV4KJ9lSdfv4h/ppEhrU/Yudkl7jujwMZ1we6RX7DXqBfT04pVMQ4J+1wcTlsKA==",
       "dev": true
     },
     "caseless": {
@@ -1733,12 +1697,9 @@
       "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ="
     },
     "content-security-policy-builder": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/content-security-policy-builder/-/content-security-policy-builder-1.1.0.tgz",
-      "integrity": "sha1-2R8bB2I2wRmFDH3umSS/VeBXcrM=",
-      "requires": {
-        "dashify": "^0.2.0"
-      }
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/content-security-policy-builder/-/content-security-policy-builder-2.1.0.tgz",
+      "integrity": "sha512-/MtLWhJVvJNkA9dVLAp6fg9LxD2gfI6R2Fi1hPmfjYXSahJJzcfvoeDOxSyp4NvxMuwWv3WMssE9o31DoULHrQ=="
     },
     "content-type-parser": {
       "version": "1.0.2",
@@ -2049,11 +2010,6 @@
       "resolved": "https://registry.npmjs.org/dasherize/-/dasherize-2.0.0.tgz",
       "integrity": "sha1-bYCcnNDPe7iVLYD8hPoT1H3bEwg="
     },
-    "dashify": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/dashify/-/dashify-0.2.2.tgz",
-      "integrity": "sha1-agdBWgHJH69KMuONnfunH2HLIP4="
-    },
     "date-now": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
@@ -2245,9 +2201,9 @@
       }
     },
     "dns-prefetch-control": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/dns-prefetch-control/-/dns-prefetch-control-0.1.0.tgz",
-      "integrity": "sha1-YN20V3dOF48flBXwyrsOhbCzALI="
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/dns-prefetch-control/-/dns-prefetch-control-0.2.0.tgz",
+      "integrity": "sha512-hvSnros73+qyZXhHFjx2CMLwoj3Fe7eR9EJsFsqmcI1bB2OBWL/+0YzaEaKssCHnj/6crawNnUyw74Gm2EKe+Q=="
     },
     "doctrine": {
       "version": "3.0.0",
@@ -2317,9 +2273,9 @@
       }
     },
     "dont-sniff-mimetype": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/dont-sniff-mimetype/-/dont-sniff-mimetype-1.0.0.tgz",
-      "integrity": "sha1-WTKJDcn04vGeXrAqIAJuXl78j1g="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/dont-sniff-mimetype/-/dont-sniff-mimetype-1.1.0.tgz",
+      "integrity": "sha512-ZjI4zqTaxveH2/tTlzS1wFp+7ncxNZaIEWYg3lzZRHkKf5zPT/MnEG6WL0BhHMJUabkh8GeU5NL5j+rEUCb7Ug=="
     },
     "dot-prop": {
       "version": "4.2.0",
@@ -2381,7 +2337,6 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-4.1.1.tgz",
       "integrity": "sha512-FjEWG9Jb/ppK/2zToP+U5dds114fM1ZOJqMAR4aXXL5CvyPE9fiqBK/9YcwC9poIFQTEJk/EM/zyRwziziRZrg==",
-      "optional": true,
       "requires": {
         "debug": "^3.0.0",
         "env-paths": "^1.0.0",
@@ -2398,7 +2353,6 @@
           "version": "3.2.6",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
           "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "optional": true,
           "requires": {
             "ms": "^2.1.1"
           }
@@ -2411,8 +2365,7 @@
         "path-exists": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "optional": true
+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
         }
       }
     },
@@ -2545,21 +2498,22 @@
       }
     },
     "es-abstract": {
-      "version": "1.16.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.16.3.tgz",
-      "integrity": "sha512-WtY7Fx5LiOnSYgF5eg/1T+GONaGmpvpPdCpSnYij+U2gDTL0UPfWrhDw7b2IYb+9NQJsYpCA0wOQvZfsd6YwRw==",
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.0.tgz",
+      "integrity": "sha512-yYkE07YF+6SIBmg1MsJ9dlub5L48Ek7X0qz+c/CPCHS9EBXfESorzng4cJQjJW5/pB6vDF41u7F8vUhLVDqIug==",
       "dev": true,
       "requires": {
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
         "has-symbols": "^1.0.1",
-        "is-callable": "^1.1.4",
-        "is-regex": "^1.0.4",
+        "is-callable": "^1.1.5",
+        "is-regex": "^1.0.5",
         "object-inspect": "^1.7.0",
         "object-keys": "^1.1.1",
-        "string.prototype.trimleft": "^2.1.0",
-        "string.prototype.trimright": "^2.1.0"
+        "object.assign": "^4.1.0",
+        "string.prototype.trimleft": "^2.1.1",
+        "string.prototype.trimright": "^2.1.1"
       },
       "dependencies": {
         "object-keys": {
@@ -2635,9 +2589,9 @@
       }
     },
     "eslint": {
-      "version": "6.7.2",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.7.2.tgz",
-      "integrity": "sha512-qMlSWJaCSxDFr8fBPvJM9kJwbazrhNcBU3+DszDW1OlEwKBBRWsJc7NJFelvwQpanHCR14cOLD41x8Eqvo3Nng==",
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz",
+      "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
@@ -2732,12 +2686,6 @@
           "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
           "dev": true
         },
-        "lodash": {
-          "version": "4.17.15",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
-          "dev": true
-        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -2923,9 +2871,9 @@
       }
     },
     "expect-ct": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/expect-ct/-/expect-ct-0.1.0.tgz",
-      "integrity": "sha1-UnNWeN4YUwiQ2Ne5XwrGNkCVgJQ="
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/expect-ct/-/expect-ct-0.2.0.tgz",
+      "integrity": "sha512-6SK3MG/Bbhm8MsgyJAylg+ucIOU71/FzyFalcfu5nY19dH8y/z0tBJU0wrNBXD4B27EoQtqPF/9wqH0iYAd04g=="
     },
     "express": {
       "version": "4.16.2",
@@ -3304,6 +3252,11 @@
         "pend": "~1.2.0"
       }
     },
+    "feature-policy": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/feature-policy/-/feature-policy-0.3.0.tgz",
+      "integrity": "sha512-ZtijOTFN7TzCujt1fnNhfWPFPSHeZkesff9AXZj+UEjYBynWNUIYpC87Ve4wHzyexQsImicLu7WsC2LHq7/xrQ=="
+    },
     "feedme": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/feedme/-/feedme-1.2.0.tgz",
@@ -3439,9 +3392,9 @@
       }
     },
     "frameguard": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/frameguard/-/frameguard-3.0.0.tgz",
-      "integrity": "sha1-e8rUae57lukdEs6zlZx4I1qScuk="
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/frameguard/-/frameguard-3.1.0.tgz",
+      "integrity": "sha512-TxgSKM+7LTA6sidjOiSZK9wxY0ffMPY3Wta//MqwmX0nZuEHc8QrkV8Fh3ZhMJeiH+Uyh/tcaarImRy8u77O7g=="
     },
     "fs-constants": {
       "version": "1.0.0",
@@ -3459,7 +3412,6 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
       "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
-      "optional": true,
       "requires": {
         "graceful-fs": "^4.1.2",
         "jsonfile": "^4.0.0",
@@ -3470,7 +3422,6 @@
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
           "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-          "optional": true,
           "requires": {
             "graceful-fs": "^4.1.6"
           }
@@ -3912,18 +3863,18 @@
       }
     },
     "grunt-markdownlint": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/grunt-markdownlint/-/grunt-markdownlint-2.7.0.tgz",
-      "integrity": "sha512-HcZQmsQEjYETviZ0l/TlNJXCjmujDlK9CWQZHVmt8n3D0FgMDgXR/pBPjW/cutIKMbWfUWv/iX2xPfRKm8vG8Q==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/grunt-markdownlint/-/grunt-markdownlint-2.8.0.tgz",
+      "integrity": "sha512-3HNNKB1C+qC+iB9ecDGymQMv2CVx+XHFxP3e1n/d1lE44GvJOaJFYCS6IgAc//Fhcz4v4X9XJCHDCTfAWuq5gg==",
       "dev": true,
       "requires": {
-        "markdownlint": "^0.17.0"
+        "markdownlint": "^0.18.0"
       }
     },
     "grunt-stylelint": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/grunt-stylelint/-/grunt-stylelint-0.12.0.tgz",
-      "integrity": "sha512-6ntxeja38tCZHg3xVgRzRm6taiCuAU9PwqsOdPFwXg1VOR+kx/d8tQvgO9Suf4ouo93zq4bYsMX/JOBJIYEJvw==",
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/grunt-stylelint/-/grunt-stylelint-0.13.0.tgz",
+      "integrity": "sha512-Ju9N03UBvPwcdoJYL77pDk0k0E8VD4oYtTfoRwvvPM1ON2MjOXWwPyaeIoYPnhUwcfN9D7TaXnTtuhNoWNsyrQ==",
       "dev": true,
       "requires": {
         "chalk": "^2.4.2"
@@ -3985,12 +3936,6 @@
           "requires": {
             "lodash": "^4.17.14"
           }
-        },
-        "lodash": {
-          "version": "4.17.15",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
-          "dev": true
         }
       }
     },
@@ -4102,42 +4047,54 @@
       "dev": true
     },
     "helmet": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/helmet/-/helmet-3.9.0.tgz",
-      "integrity": "sha512-czCyS77TyanWlfVSoGlb9GBJV2Q2zJayKxU5uBw0N1TzDTs/qVNh1SL8Q688KU0i0Sb7lQ/oLtnaEqXzl2yWvA==",
+      "version": "3.21.2",
+      "resolved": "https://registry.npmjs.org/helmet/-/helmet-3.21.2.tgz",
+      "integrity": "sha512-okUo+MeWgg00cKB8Csblu8EXgcIoDyb5ZS/3u0W4spCimeVuCUvVZ6Vj3O2VJ1Sxpyb8jCDvzu0L1KKT11pkIg==",
       "requires": {
-        "dns-prefetch-control": "0.1.0",
-        "dont-sniff-mimetype": "1.0.0",
-        "expect-ct": "0.1.0",
-        "frameguard": "3.0.0",
-        "helmet-csp": "2.6.0",
-        "hide-powered-by": "1.0.0",
+        "depd": "2.0.0",
+        "dns-prefetch-control": "0.2.0",
+        "dont-sniff-mimetype": "1.1.0",
+        "expect-ct": "0.2.0",
+        "feature-policy": "0.3.0",
+        "frameguard": "3.1.0",
+        "helmet-crossdomain": "0.4.0",
+        "helmet-csp": "2.9.4",
+        "hide-powered-by": "1.1.0",
         "hpkp": "2.0.0",
-        "hsts": "2.1.0",
-        "ienoopen": "1.0.0",
-        "nocache": "2.0.0",
-        "referrer-policy": "1.1.0",
-        "x-xss-protection": "1.0.0"
+        "hsts": "2.2.0",
+        "ienoopen": "1.1.0",
+        "nocache": "2.1.0",
+        "referrer-policy": "1.2.0",
+        "x-xss-protection": "1.3.0"
       },
       "dependencies": {
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
+        }
+      }
+    },
+    "helmet-crossdomain": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/helmet-crossdomain/-/helmet-crossdomain-0.4.0.tgz",
+      "integrity": "sha512-AB4DTykRw3HCOxovD1nPR16hllrVImeFp5VBV9/twj66lJ2nU75DP8FPL0/Jp4jj79JhTfG+pFI2MD02kWJ+fA=="
+    },
     "helmet-csp": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.6.0.tgz",
-          "integrity": "sha512-n/oW9l6RtO4f9YvphsNzdvk1zITrSN7iRT8ojgrJu/N3mVdHl9zE4OjbiHWcR64JK32kbqx90/yshWGXcjUEhw==",
+      "version": "2.9.4",
+      "resolved": "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.9.4.tgz",
+      "integrity": "sha512-qUgGx8+yk7Xl8XFEGI4MFu1oNmulxhQVTlV8HP8tV3tpfslCs30OZz/9uQqsWPvDISiu/NwrrCowsZBhFADYqg==",
       "requires": {
+        "bowser": "^2.7.0",
         "camelize": "1.0.0",
-            "content-security-policy-builder": "1.1.0",
-            "dasherize": "2.0.0",
-            "lodash.reduce": "4.6.0",
-            "platform": "1.3.4"
-          }
-        }
+        "content-security-policy-builder": "2.1.0",
+        "dasherize": "2.0.0"
       }
     },
     "hide-powered-by": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hide-powered-by/-/hide-powered-by-1.0.0.tgz",
-      "integrity": "sha1-SoWtZYgfYoV/xwr3F0oRhNzM4ys="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/hide-powered-by/-/hide-powered-by-1.1.0.tgz",
+      "integrity": "sha512-Io1zA2yOA1YJslkr+AJlWSf2yWFkKjvkcL9Ni1XSUqnGLr/qRQe2UI3Cn/J9MsJht7yEVCe0SscY1HgVMujbgg=="
     },
     "homedir-polyfill": {
       "version": "1.0.1",
@@ -4165,9 +4122,19 @@
       "integrity": "sha1-EOFCJk52IVpdMMROxD3mTe5tFnI="
     },
     "hsts": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/hsts/-/hsts-2.1.0.tgz",
-      "integrity": "sha512-zXhh/DqgrTXJ7erTN6Fh5k/xjMhDGXCqdYN3wvxUvGUQvnxcFfUd8E+6vLg/nk3ss1TYMb+DhRl25fYABioTvA=="
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/hsts/-/hsts-2.2.0.tgz",
+      "integrity": "sha512-ToaTnQ2TbJkochoVcdXYm4HOCliNozlviNsg+X2XQLQvZNI/kCHR9rZxVYpJB3UPcHz80PgxRyWQ7PdU1r+VBQ==",
+      "requires": {
+        "depd": "2.0.0"
+      },
+      "dependencies": {
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
+        }
+      }
     },
     "html-encoding-sniffer": {
       "version": "1.0.2",
@@ -4239,23 +4206,38 @@
       }
     },
     "https-proxy-agent": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.1.tgz",
-      "integrity": "sha512-LK6tQUR/VOkTI6ygAfWUKKP95I+e6M1h7N3PncGu1CATHCnex+CAv9ttR0lbHu1Uk2PXm/WoAHFo6JCGwMjVMw==",
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
+      "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
       "dev": true,
       "requires": {
-        "agent-base": "^4.1.0",
+        "agent-base": "^4.3.0",
         "debug": "^3.1.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+        "agent-base": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
+          "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
+            "es6-promisify": "^5.0.0"
           }
+        },
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
         }
       }
     },
@@ -4280,9 +4262,9 @@
       "dev": true
     },
     "ienoopen": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/ienoopen/-/ienoopen-1.0.0.tgz",
-      "integrity": "sha1-NGpCj0dKrI9QzzeE6i0PFvYr2ms="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ienoopen/-/ienoopen-1.1.0.tgz",
+      "integrity": "sha512-MFs36e/ca6ohEKtinTJ5VvAJ6oDRAYFdYXweUnGY9L9vcoqFOU4n2ZhmJ0C4z/cwGZ3YIQRSB3XZ1+ghZkY5NQ=="
     },
     "ignore": {
       "version": "4.0.6",
@@ -4352,9 +4334,9 @@
       "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4="
     },
     "inquirer": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.0.tgz",
-      "integrity": "sha512-rSdC7zelHdRQFkWnhsMu2+2SO41mpv2oF2zy4tMhmiLWkcKbOAs87fWAJhVXttKVwhdZvymvnuM95EyEXg2/tQ==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.1.tgz",
+      "integrity": "sha512-V1FFQ3TIO15det8PijPLFR9M9baSlnRs9nL7zWu1MNVA2T9YVl9ZbrHJhYs7e9X8jeMZ3lr2JH/rdHFgNCBdYw==",
       "dev": true,
       "requires": {
         "ansi-escapes": "^4.2.1",
@@ -4366,7 +4348,7 @@
         "lodash": "^4.17.15",
         "mute-stream": "0.0.8",
         "run-async": "^2.2.0",
-        "rxjs": "^6.4.0",
+        "rxjs": "^6.5.3",
         "string-width": "^4.1.0",
         "strip-ansi": "^5.1.0",
         "through": "^2.3.6"
@@ -4410,12 +4392,6 @@
           "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
           "dev": true
         },
-        "lodash": {
-          "version": "4.17.15",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
-          "dev": true
-        },
         "string-width": {
           "version": "4.2.0",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
@@ -4555,9 +4531,9 @@
       }
     },
     "is-callable": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
-      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
+      "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
       "dev": true
     },
     "is-data-descriptor": {
@@ -4587,9 +4563,9 @@
       }
     },
     "is-date-object": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
+      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
       "dev": true
     },
     "is-decimal": {
@@ -4714,12 +4690,12 @@
       "dev": true
     },
     "is-regex": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
-      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
+      "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
       "dev": true,
       "requires": {
-        "has": "^1.0.1"
+        "has": "^1.0.3"
       }
     },
     "is-regexp": {
@@ -5155,9 +5131,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.11",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
     },
     "lodash.assign": {
       "version": "4.2.0",
@@ -5183,11 +5159,6 @@
       "integrity": "sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0=",
       "dev": true
     },
-    "lodash.reduce": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz",
-      "integrity": "sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs="
-    },
     "lodash.sortby": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
@@ -5307,9 +5278,9 @@
       "dev": true
     },
     "markdownlint": {
-      "version": "0.17.2",
-      "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.17.2.tgz",
-      "integrity": "sha512-vsxopn0qEdm0P2XI3S9sVA+jvjKjR8lHZ+0FKlusth+1UK9tI29mRFkKeZPERmbWsMehJcogfMieBUkMgNEFkQ==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.18.0.tgz",
+      "integrity": "sha512-nQAfK9Pbq0ZRoMC/abNGterEnV3kL8MZmi0WHhw8WJKoIbsm3cXGufGsxzCRvjW15cxe74KWcxRSKqwplS26Bw==",
       "dev": true,
       "requires": {
         "markdown-it": "10.0.0"
@@ -5738,9 +5709,9 @@
       "dev": true
     },
     "nocache": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/nocache/-/nocache-2.0.0.tgz",
-      "integrity": "sha1-ICtIAhoMTL3i34DeFaF0Q8i0OYA="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/nocache/-/nocache-2.1.0.tgz",
+      "integrity": "sha512-0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q=="
     },
     "node-cleanup": {
       "version": "2.1.2",
@@ -5777,9 +5748,9 @@
       }
     },
     "node-releases": {
-      "version": "1.1.42",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.42.tgz",
-      "integrity": "sha512-OQ/ESmUqGawI2PRX+XIRao44qWYBBfN54ImQYdWVTQqUckuejOg76ysSqDBK8NG3zwySRVnX36JwDQ6x+9GxzA==",
+      "version": "1.1.44",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.44.tgz",
+      "integrity": "sha512-NwbdvJyR7nrcGrXvKAvzc5raj/NkoJudkarh2yIpJ4t0NH4aqjUDz/486P+ynIW5eokKOfzGNRdYoLfBlomruw==",
       "dev": true,
       "requires": {
         "semver": "^6.3.0"
@@ -5968,13 +5939,13 @@
       }
     },
     "object.getownpropertydescriptors": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
-      "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
+      "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.5.1"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1"
       }
     },
     "object.pick": {
@@ -6285,11 +6256,6 @@
       "integrity": "sha1-DPd1eml38b9/ajIge3CeN3OI6HQ=",
       "dev": true
     },
-    "platform": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/platform/-/platform-1.3.4.tgz",
-      "integrity": "sha1-bw+xftqqSPIUQrOpdcBjEw8cPr0="
-    },
     "plur": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/plur/-/plur-1.0.0.tgz",
@@ -6309,9 +6275,9 @@
       "dev": true
     },
     "postcss": {
-      "version": "7.0.24",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.24.tgz",
-      "integrity": "sha512-Xl0XvdNWg+CblAXzNvbSOUvgJXwSjmbAKORqyw9V2AlHrm1js2gFw9y3jibBAhpKZi8b5JzJCVh/FyzPsTtgTA==",
+      "version": "7.0.25",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.25.tgz",
+      "integrity": "sha512-NXXVvWq9icrm/TgQC0O6YVFi4StfJz46M1iNd/h6B26Nvh/HKI+q4YZtFN/EjcInZliEscO/WL10BXnc1E5nwg==",
       "dev": true,
       "requires": {
         "chalk": "^2.4.2",
@@ -6737,9 +6703,9 @@
       }
     },
     "referrer-policy": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/referrer-policy/-/referrer-policy-1.1.0.tgz",
-      "integrity": "sha1-NXdOtzW/UPtsB46DM0tHI1AgfXk="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/referrer-policy/-/referrer-policy-1.2.0.tgz",
+      "integrity": "sha512-LgQJIuS6nAy1Jd88DCQRemyE3mS+ispwlqMk3b0yjZ257fI1v9c+/p6SD5gP5FGyXUIgrNOAfmyioHwZtYv2VA=="
     },
     "regenerator-runtime": {
       "version": "0.10.5",
@@ -6959,9 +6925,9 @@
       },
       "dependencies": {
         "lodash": {
-          "version": "4.17.5",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz",
-          "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==",
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
           "dev": true
         }
       }
@@ -7105,9 +7071,9 @@
       }
     },
     "rxjs": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz",
-      "integrity": "sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==",
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz",
+      "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==",
       "dev": true,
       "requires": {
         "tslib": "^1.9.0"
@@ -7622,9 +7588,9 @@
       }
     },
     "string.prototype.trimleft": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz",
-      "integrity": "sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz",
+      "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==",
       "dev": true,
       "requires": {
         "define-properties": "^1.1.3",
@@ -7632,9 +7598,9 @@
       }
     },
     "string.prototype.trimright": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz",
-      "integrity": "sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz",
+      "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==",
       "dev": true,
       "requires": {
         "define-properties": "^1.1.3",
@@ -7694,9 +7660,9 @@
       "dev": true
     },
     "stylelint": {
-      "version": "12.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-12.0.0.tgz",
-      "integrity": "sha512-TwqtATrFOT07SPlUGyHN7tVhWqxwitn5BlAvyBQy/ekA+Nwu4mLU9L1dvGQPNxHUBLowjvkSW18QzHHR6/FVVQ==",
+      "version": "12.0.1",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-12.0.1.tgz",
+      "integrity": "sha512-1mn39pqZiC/e8KUPoRMc1WMM83Upb2ILaSGxkCvKxALHutEOs2txcPQocJiXdO4Zx4FY4prGqjlkwrbthAxqig==",
       "dev": true,
       "requires": {
         "autoprefixer": "^9.7.1",
@@ -7877,12 +7843,6 @@
             "path-exists": "^3.0.0"
           }
         },
-        "lodash": {
-          "version": "4.17.15",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
-          "dev": true
-        },
         "log-symbols": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
@@ -8151,7 +8111,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-2.0.2.tgz",
       "integrity": "sha1-D0LBDl0F2l1C7qPlbDOZo31sWz4=",
-      "optional": true,
       "requires": {
         "debug": "^2.2.0"
       }
@@ -8237,12 +8196,6 @@
           "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
           "dev": true
         },
-        "lodash": {
-          "version": "4.17.15",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
-          "dev": true
-        },
         "string-width": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -8710,8 +8663,7 @@
     "universalify": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-      "optional": true
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
     },
     "unix-crypt-td-js": {
       "version": "1.0.0",
@@ -9283,9 +9235,9 @@
       "dev": true
     },
     "x-xss-protection": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/x-xss-protection/-/x-xss-protection-1.0.0.tgz",
-      "integrity": "sha1-iYr7k4abJGYc+cUvnujbjtB2Tdk="
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/x-xss-protection/-/x-xss-protection-1.3.0.tgz",
+      "integrity": "sha512-kpyBI9TlVipZO4diReZMAHWtS0MMa/7Kgx8hwG/EuZLiA6sg4Ah/4TRdASHhRRN3boobzcYgFRUFSgHRge6Qhg=="
     },
     "xml-name-validator": {
       "version": "3.0.0",
@@ -9433,14 +9385,6 @@
         "flat": "^4.1.0",
         "lodash": "^4.17.15",
         "yargs": "^13.3.0"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.15",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
-          "dev": true
-        }
       }
     },
     "yauzl": {

package.json

@@ -64,9 +64,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",
     "moment": "latest",
     "node_helper": "git://github.com/sdetweil/nodehelper.git",
     "request": "^2.88.0",

run-start.sh

@@ -7,6 +7,7 @@ if [ -z "$DISPLAY" ]; then #If not set DISPLAY is SSH remote or tty
 fi
 # get the processor architecture
 arch=$(uname -m)
+false='false'
 
 # get the config option, if any
 # only check non comment lines

tests/e2e/modules/weather_spec.js

@@ -11,6 +11,12 @@ const {generateWeather, generateWeatherForecast} = require("./mocks");
 const wait = () => new Promise(res => setTimeout(res, 3000));
 
 describe("Weather module", function() {
+	before(function() {
+		// Skipping the weather tests for now since these seem to give issues.
+		// Please send a PR if you know how to fix these. Thanks!
+		this.skip();
+	});
+
 	let app;
 
 	helpers.setupTimeout(this);
@@ -234,7 +240,7 @@ describe("Weather module", function() {
 
 				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})`);
@@ -252,16 +258,16 @@ describe("Weather module", 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]);
 
-                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);
 			});

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": {