kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-28 12:12:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #652 from roramirez/electron-issues

Browse Source 
Electron issues
This commit is contained in:
Michael Teeuw 2017-01-27 09:02:20 +01:00 committed by GitHub
commit 552ea0356e
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -26,6 +26,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Option to use RegExp in Calendar's titleReplace. - Option to use RegExp in Calendar's titleReplace.
- Hungarian Translation. - Hungarian Translation.
- Icelandic Translation. - Icelandic Translation.
- Add use a script to prevent when is run by SSH session set DISPLAY enviroment.
- Enable ability to set configuration file by the enviroment variable called MM_CONFIG_FILE. - Enable ability to set configuration file by the enviroment variable called MM_CONFIG_FILE.
### Fixed ### Fixed

2
package.json
View File

@ -4,7 +4,7 @@
"description": "A modular interface for smart mirrors.", "description": "A modular interface for smart mirrors.",
"main": "js/electron.js", "main": "js/electron.js",
"scripts": { "scripts": {
"start": "electron js/electron.js", "start": "sh run-start.sh",
"postinstall": "sh installers/postinstall/postinstall.sh", "postinstall": "sh installers/postinstall/postinstall.sh",
"test": "./node_modules/mocha/bin/mocha tests --recursive" "test": "./node_modules/mocha/bin/mocha tests --recursive"
}, },

4
run-start.sh Normal file
View File

@ -0,0 +1,4 @@
if [ -z "$DISPLAY" ]; then #If not set DISPLAY is SSH remote or tty
export DISPLAY=:0 # Set by defaul display
fi
electron js/electron.js