From a4953028d0b3255634fbf09c5b77aa69abacebdb Mon Sep 17 00:00:00 2001
From: Sam Detweiler <sdetweil@gmail.com>
Date: Fri, 25 Oct 2019 08:13:25 -0500
Subject: [PATCH 1/3] 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 985698bbc3ab110b89b713226080c3be280a5340 Mon Sep 17 00:00:00 2001
From: Sam Detweiler <sdetweil@gmail.com>
Date: Sun, 27 Oct 2019 09:13:44 -0500
Subject: [PATCH 2/3] 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 <sdetweil@gmail.com>
Date: Sun, 27 Oct 2019 09:14:55 -0500
Subject: [PATCH 3/3] 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"