diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c5fc3da..38b1543f 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 predicted 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). 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"; 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", diff --git a/run-start.sh b/run-start.sh index cd32fda4..8ce6b089 100755 --- a/run-start.sh +++ b/run-start.sh @@ -15,12 +15,14 @@ serveronly=$(grep -v '^\s//' config/config.js | grep -i serveronly: | awk '{pri 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 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"