From 296fb68564df0e96bf9a1278a8b01d88def243c9 Mon Sep 17 00:00:00 2001
From: Ryan Hanson <13651296+rxhanson@users.noreply.github.com>
Date: Mon, 5 Aug 2019 21:19:24 -0400
Subject: [PATCH 1/5] WM: Add support for Rectangle on macOS

Rectangle is a Swift rewrite of the Spectacle application.
---
 neofetch | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/neofetch b/neofetch
index f95b4e39..6a21314d 100755
--- a/neofetch
+++ b/neofetch
@@ -1631,7 +1631,7 @@ get_wm() {
     else
         case "$os" in
             "Mac OS X")
-                ps_line="$(ps -e | grep -o '[S]pectacle\|[A]methyst\|[k]wm\|[c]hun[k]wm\|[y]abai')"
+                ps_line="$(ps -e | grep -o '[S]pectacle\|[A]methyst\|[k]wm\|[c]hun[k]wm\|[y]abai\|[R]ectangle')"
 
                 case "$ps_line" in
                     *"chunkwm"*)   wm="chunkwm" ;;
@@ -1639,6 +1639,7 @@ get_wm() {
                     *"yabai"*)     wm="yabai" ;;
                     *"Amethyst"*)  wm="Amethyst" ;;
                     *"Spectacle"*) wm="Spectacle" ;;
+                    *"Rectangle"*) wm="Rectangle" ;;
                     *)             wm="Quartz Compositor" ;;
                 esac
             ;;

From 4548c56ee7f95dbfb61c312b228af47d55a092b5 Mon Sep 17 00:00:00 2001
From: Ryan Hanson <13651296+rxhanson@users.noreply.github.com>
Date: Wed, 7 Aug 2019 09:34:03 -0400
Subject: [PATCH 2/5] Refactored grep for macOS window manager detection

Co-Authored-By: nibblonian <ted+github@rusts.net>
---
 neofetch | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/neofetch b/neofetch
index 6a21314d..376da939 100755
--- a/neofetch
+++ b/neofetch
@@ -1631,7 +1631,18 @@ get_wm() {
     else
         case "$os" in
             "Mac OS X")
-                ps_line="$(ps -e | grep -o '[S]pectacle\|[A]methyst\|[k]wm\|[c]hun[k]wm\|[y]abai\|[R]ectangle')"
+                wm_names=(
+                    "[S]pectacle"
+                    "[A]methyst"
+                    "[k]wm"
+                    "[c]chun[k]wm"
+                    "[y]abai"
+                    "[R]ectangle"
+                )
+
+                regex_part=$( IFS='|'; echo "${wm_names[*]}" )
+
+                ps_line=$(ps -e | grep -Eio "$regex_part")
 
                 case "$ps_line" in
                     *"chunkwm"*)   wm="chunkwm" ;;

From eb5cf17fdb43c64a78614328136d00996f60ef5e Mon Sep 17 00:00:00 2001
From: Ryan Hanson <13651296+rxhanson@users.noreply.github.com>
Date: Wed, 7 Aug 2019 09:46:32 -0400
Subject: [PATCH 3/5] Remove unnecessary -i grep flag from wm ps

---
 neofetch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/neofetch b/neofetch
index 376da939..8e8ca7e1 100755
--- a/neofetch
+++ b/neofetch
@@ -1642,7 +1642,7 @@ get_wm() {
 
                 regex_part=$( IFS='|'; echo "${wm_names[*]}" )
 
-                ps_line=$(ps -e | grep -Eio "$regex_part")
+                ps_line=$(ps -e | grep -Eo "$regex_part")
 
                 case "$ps_line" in
                     *"chunkwm"*)   wm="chunkwm" ;;

From a5c4a020c065623dc706985d83986e0103b1bf83 Mon Sep 17 00:00:00 2001
From: Ryan Hanson <13651296+rxhanson@users.noreply.github.com>
Date: Wed, 7 Aug 2019 18:12:40 -0400
Subject: [PATCH 4/5] Removed extraneous c from chunkwm match

---
 neofetch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/neofetch b/neofetch
index 8e8ca7e1..2d3adf8b 100755
--- a/neofetch
+++ b/neofetch
@@ -1635,7 +1635,7 @@ get_wm() {
                     "[S]pectacle"
                     "[A]methyst"
                     "[k]wm"
-                    "[c]chun[k]wm"
+                    "[c]hun[k]wm"
                     "[y]abai"
                     "[R]ectangle"
                 )

From 5dc00cba146dd34ce9385344c729ccd0451f5449 Mon Sep 17 00:00:00 2001
From: Ryan Hanson <13651296+rxhanson@users.noreply.github.com>
Date: Sat, 10 Aug 2019 17:41:21 -0400
Subject: [PATCH 5/5] Removed subshell from ps grep for macOS wm

---
 neofetch | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/neofetch b/neofetch
index 2d3adf8b..4b3d9fd0 100755
--- a/neofetch
+++ b/neofetch
@@ -1631,18 +1631,13 @@ get_wm() {
     else
         case "$os" in
             "Mac OS X")
-                wm_names=(
-                    "[S]pectacle"
-                    "[A]methyst"
-                    "[k]wm"
-                    "[c]hun[k]wm"
-                    "[y]abai"
-                    "[R]ectangle"
-                )
-
-                regex_part=$( IFS='|'; echo "${wm_names[*]}" )
-
-                ps_line=$(ps -e | grep -Eo "$regex_part")
+                ps_line="$(ps -e | grep -o \
+                    -e "[S]pectacle" \
+                    -e "[A]methyst" \
+                    -e "[k]wm" \
+                    -e "[c]hun[k]wm" \
+                    -e "[y]abai" \
+                    -e "[R]ectangle")"
 
                 case "$ps_line" in
                     *"chunkwm"*)   wm="chunkwm" ;;