From d71fd0ff2d85e6b96f2602b05a8ae6b0a4bff47f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?=
Date: Mon, 9 Jan 2017 20:39:48 -0300
Subject: [PATCH 1/2] Add pm2 configuration for manager MagicMirror in script
installer
---
CHANGELOG.md | 1 +
installers/mm.sh | 2 ++
installers/pm2_MagicMirror.json | 7 +++++++
installers/raspberry.sh | 6 ++++++
4 files changed, 16 insertions(+)
create mode 100755 installers/mm.sh
create mode 100644 installers/pm2_MagicMirror.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6408d1d2..8f6205eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Added
- Add loaded function to modules, providing an async callback.
+- Add use pm2 for manager process into Installer RaspberryPi script
## [2.1.0] - 2016-12-31
diff --git a/installers/mm.sh b/installers/mm.sh
new file mode 100755
index 00000000..cc6c4bb3
--- /dev/null
+++ b/installers/mm.sh
@@ -0,0 +1,2 @@
+cd ~/MagicMirror
+DISPLAY=:0 npm start
diff --git a/installers/pm2_MagicMirror.json b/installers/pm2_MagicMirror.json
new file mode 100644
index 00000000..55f8df31
--- /dev/null
+++ b/installers/pm2_MagicMirror.json
@@ -0,0 +1,7 @@
+{
+ apps : [{
+ name : "MagicMirror",
+ script : "/home/pi/MagicMirror/installer/mm.sh",
+ watch : ["/home/pi/MagicMirror/config/config.js"]
+ }]
+}
diff --git a/installers/raspberry.sh b/installers/raspberry.sh
index cd995a1e..df3994bc 100644
--- a/installers/raspberry.sh
+++ b/installers/raspberry.sh
@@ -141,6 +141,12 @@ else
echo -e "\e[93mplymouth is not installed.\e[0m";
fi
+# Use pm2 control like a service MagicMirror
+sudo npm install -g pm2
+sudo su -c "env PATH=$PATH:/usr/bin pm2 startup linux -u pi --hp /home/pi"
+pm2 start ~/MagicMirror/installers/pm2_MagicMirror.json
+pm2 save
+
echo " "
echo -e "\e[92mWe're ready! Run \e[1m\e[97mDISPLAY=:0 npm start\e[0m\e[92m from the ~/MagicMirror directory to start your MagicMirror.\e[0m"
echo " "
From 4bb3d33907816b139e4fc4a3a174c17d12ea275d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?=
Date: Wed, 11 Jan 2017 10:22:13 -0300
Subject: [PATCH 2/2] add choice to use pm2 for auto starting of MagicMirror
---
installers/raspberry.sh | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/installers/raspberry.sh b/installers/raspberry.sh
index df3994bc..b6ab3435 100644
--- a/installers/raspberry.sh
+++ b/installers/raspberry.sh
@@ -142,10 +142,14 @@ else
fi
# Use pm2 control like a service MagicMirror
-sudo npm install -g pm2
-sudo su -c "env PATH=$PATH:/usr/bin pm2 startup linux -u pi --hp /home/pi"
-pm2 start ~/MagicMirror/installers/pm2_MagicMirror.json
-pm2 save
+read -p "Do you want use pm2 for auto starting of your MagicMirror (y/n)?" choice
+if [[ $choice =~ ^[Yy]$ ]]
+then
+ sudo npm install -g pm2
+ sudo su -c "env PATH=$PATH:/usr/bin pm2 startup linux -u pi --hp /home/pi"
+ pm2 start ~/MagicMirror/installers/pm2_MagicMirror.json
+ pm2 save
+fi
echo " "
echo -e "\e[92mWe're ready! Run \e[1m\e[97mDISPLAY=:0 npm start\e[0m\e[92m from the ~/MagicMirror directory to start your MagicMirror.\e[0m"