From a4953028d0b3255634fbf09c5b77aa69abacebdb Mon Sep 17 00:00:00 2001 From: Sam Detweiler Date: Fri, 25 Oct 2019 08:13:25 -0500 Subject: [PATCH 1/7] remove electron from dependencies section --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 5bf564dd..c7ff0624 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,6 @@ "dependencies": { "colors": "^1.1.2", "console-stamp": "^0.2.9", - "electron": "^3.0.13", "express": "^4.16.2", "express-ipfilter": "^1.0.1", "feedme": "latest", From cb7ccd78543c1288332a32ab9709c79701a748fc Mon Sep 17 00:00:00 2001 From: Sam Detweiler Date: Fri, 25 Oct 2019 08:46:41 -0500 Subject: [PATCH 2/7] update readme and upgrade script to work from website, fix tabs in config sample --- README.md | 4 ++-- config/config.js.sample | 8 ++++---- installers/upgrade-script.sh | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 329c00df..0cf5e831 100644 --- a/README.md +++ b/README.md @@ -178,13 +178,13 @@ For more available modules, check out out the wiki page [MagicMirror² 3rd Party 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: ``` -installers/upgrade-script.sh +bash -c "$(curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/master/installers/upgrade-script.sh)" ``` This will do a test run If the test update looks good then run this command ``` -installers/upgrade-script.sh apply +bash -c "$(curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/master/installers/upgrade-script.sh)" apply ``` If there are changes you have made, they will be listed, and u will have the opportunity to save your work diff --git a/config/config.js.sample b/config/config.js.sample index 0e5ff840..115e2dd2 100644 --- a/config/config.js.sample +++ b/config/config.js.sample @@ -25,10 +25,10 @@ var config = { 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 + // 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: [ { diff --git a/installers/upgrade-script.sh b/installers/upgrade-script.sh index 9dd5d76f..88fea656 100755 --- a/installers/upgrade-script.sh +++ b/installers/upgrade-script.sh @@ -78,12 +78,12 @@ if [ -d ~/MagicMirror ]; then 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 + 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 + fi + fi echo update log will be in $logfile # used for parsing the array of module names SAVEIFS=$IFS # Save current IFS From 985698bbc3ab110b89b713226080c3be280a5340 Mon Sep 17 00:00:00 2001 From: Sam Detweiler Date: Sun, 27 Oct 2019 09:13:44 -0500 Subject: [PATCH 3/7] fix for no 'Xorg' process on MacOS --- css/custom.css | 14 -------------- run-start.sh | 6 ++++-- 2 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 css/custom.css diff --git a/css/custom.css b/css/custom.css deleted file mode 100644 index 7d0d0681..00000000 --- a/css/custom.css +++ /dev/null @@ -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 { - - } diff --git a/run-start.sh b/run-start.sh index a6c07520..c9cf80ad 100755 --- a/run-start.sh +++ b/run-start.sh @@ -13,12 +13,14 @@ serveronly=$(grep -i serveronly: config/config.js | awk '{print tolower($2)}' | 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" -o "$xorg." == "." ]; then +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 @@ -59,4 +61,4 @@ if [ "$serveronly." != "false." -o "$arch" == "armv6l" -o "$xorg." == "." ]; t else # we can use electron directly `electron js/electron.js $1`; -fi \ No newline at end of file +fi From 420aaa92fa7387c6c3f9404b9fc6cb25565c7f1d Mon Sep 17 00:00:00 2001 From: Sam Detweiler Date: Sun, 27 Oct 2019 09:14:55 -0500 Subject: [PATCH 4/7] fix for MacOS --- untrack-css.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/untrack-css.sh b/untrack-css.sh index 580052e6..d5969b84 100755 --- a/untrack-css.sh +++ b/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" From 1dfec119bb98300c9bf931dd1b1708ce43ba32bc Mon Sep 17 00:00:00 2001 From: Fritz Jay Date: Tue, 12 Nov 2019 18:16:55 -0800 Subject: [PATCH 5/7] Fixed bug that was causing predicted amount of rain value to use DOT as a decimal separator regardless of the decimalSymbol config value. --- modules/default/weatherforecast/weatherforecast.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/default/weatherforecast/weatherforecast.js b/modules/default/weatherforecast/weatherforecast.js index c4d43ede..b8fab9e4 100644 --- a/modules/default/weatherforecast/weatherforecast.js +++ b/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"; From 8900e069f331021c353c5767d76f470b4d2a3ea7 Mon Sep 17 00:00:00 2001 From: Fritz Jay Date: Tue, 12 Nov 2019 19:26:38 -0800 Subject: [PATCH 6/7] Updated changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c5fc3da..e42770a6 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,7 +25,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Updated ### Fixed - +- Fixed issue in weatherforecast module where predicated amount of rain was not using the decimal symbol specified in config.js. + ## [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). From 24f74e1400a106fee87198544755bee1e2d9702b Mon Sep 17 00:00:00 2001 From: Fritz Jay Date: Tue, 12 Nov 2019 19:30:42 -0800 Subject: [PATCH 7/7] Fixed spelling error. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e42770a6..38b1543f 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,7 +25,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Updated ### Fixed -- Fixed issue in weatherforecast module where predicated amount of rain was not using the decimal symbol specified in config.js. +- Fixed issue in weatherforecast module where predicted amount of rain was not using the decimal symbol specified in config.js. ## [2.9.0] - 2019-10-01