wm: Added support for more window managers.

8 years ago · 1ddcc47dd6
parent 52c2e871a3
commit 1ddcc47dd6
1 changed files with 5 additions and 6 deletions
--- a/11
+++ b/11
@ -793,17 +793,16 @@ get_wm() {
                               -e "monsterwm" \
                               -e "tinywm")"

-        if [[ "$wm_version" == "on" ]]; then
-            wmv="$wm $("${wm,,}" --version || \
-                       "${wm,,}" -v || \
-                       "${wm,,}_x11" -v)" || \
-                       "${wm,,}_wayland" -v")"
+        if [[ "$wm_version" == "on" && "$wm" ]]; then
+            wmv="$("${wm,,}" --version || "${wm,,}" -v 2>&1)"
+            wmv="$wm ${wmv:-$("${wm,,}_x11" -v || "${wm,,}_wayland" -v)}"
+            wmv="${wmv/$wm ${wm}?/$wm }"
            wmv="${wmv/$wm $wm/$wm}"
-            wmv="${wmv/$wm ${wm}?/$wm}"
            wmv="${wmv/copyright*}"
            wmv="${wmv/version }"
            wmv="${wmv/©*}"
            wmv="${wmv/(c)*}"
+            wmv="${wmv/ : }"
            wm="$wmv"
        fi
    else