From 0d672420f75a272686e5a7406ac3fe0351e06c64 Mon Sep 17 00:00:00 2001 From: Nicholas Hubbard Date: Sat, 14 Jan 2017 15:32:59 -0500 Subject: [PATCH 1/4] Add postinstall script for installation --- installers/postinstall/postinstall.sh | 2 ++ package.json | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 installers/postinstall/postinstall.sh diff --git a/installers/postinstall/postinstall.sh b/installers/postinstall/postinstall.sh new file mode 100644 index 00000000..dc19df98 --- /dev/null +++ b/installers/postinstall/postinstall.sh @@ -0,0 +1,2 @@ +echo "\033[32mMagicMirror installation successful!" +exit 0 diff --git a/package.json b/package.json index 118c9837..9d69eb58 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,8 @@ "description": "A modular interface for smart mirrors.", "main": "js/electron.js", "scripts": { - "start": "electron js/electron.js" + "start": "electron js/electron.js", + "postinstall": "sh installers/postinstall.sh" }, "repository": { "type": "git", From 5c4d1c025924755c20da29e0b08c97bbf17eee8d Mon Sep 17 00:00:00 2001 From: Nicholas Hubbard Date: Sat, 14 Jan 2017 15:37:32 -0500 Subject: [PATCH 2/4] Add CHANGELOG.md --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 09c1d13d..4fc72060 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Changed - Installer: Use init config.js from config.js.sample. - Switched out `rrule` package for `rrule-alt` in order to improve calendar issues. (Experimental: [#565](https://github.com/MichMich/MagicMirror/issues/565)) -- Make mouse events pass through the region fullscreen_above to modules below. +- Make mouse events pass through the region fullscreen\_above to modules below. ### Added - Add loaded function to modules, providing an async callback. @@ -17,6 +17,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Add use pm2 for manager process into Installer RaspberryPi script - Russian Translation - Afrikaans Translation +- Add postinstall script to notify user that MagicMirror installed successfully despite warnings from NPM. ### Fixed - Update .gitignore to not ignore default modules folder. From f4c8db654c8a1c0ff663f076e03bc5fd59f3dfa5 Mon Sep 17 00:00:00 2001 From: Nicholas Hubbard Date: Sat, 14 Jan 2017 15:42:29 -0500 Subject: [PATCH 3/4] Fix postinstall error. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 32ed0b40..5b85915a 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "js/electron.js", "scripts": { "start": "electron js/electron.js", - "postinstall": "sh installers/postinstall.sh" + "postinstall": "sh installers/postinstall/postinstall.sh" }, "repository": { "type": "git", From 65a8b831502febb9f936144b51bfe7876500d458 Mon Sep 17 00:00:00 2001 From: Nicholas Hubbard Date: Sat, 14 Jan 2017 15:46:38 -0500 Subject: [PATCH 4/4] Add Cache --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index f2d34342..b37becb1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,3 +5,6 @@ node_js: before_script: - npm install grunt-cli -g script: grunt +cache: + directories: + - node_modules