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 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"