瀏覽代碼

Refactored grep for macOS window manager detection

Co-Authored-By: nibblonian <ted+github@rusts.net>
Ryan Hanson 6 年之前
父節點
當前提交
4548c56ee7
共有 1 個文件被更改,包括 12 次插入1 次删除
  1. 12 1
      neofetch

+ 12 - 1
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" ;;