Merge pull request #1796 from sdetweil/fix-untrack

Fix untrack-css on MacOS

css/custom.css

@@ -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 {
- 	
- }

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
+fi

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"