From 5981cb6eca9de3f7bd8024333e36ac7ca3ae304b Mon Sep 17 00:00:00 2001 From: Dylan Date: Tue, 16 Feb 2016 18:01:40 +1100 Subject: [PATCH 1/2] wmctrl is now a required dependency --- README.md | 12 +++++++----- fetch | 7 ------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 52206b7f..567760e4 100644 --- a/README.md +++ b/README.md @@ -67,10 +67,14 @@ your distro's logo or any ascii art of your choice! ### Required dependencies: -- `Bash 4.0+` -- `procps-ng` +- `Bash 4.0+` +- `procps-ng` - Not required on OS X +##### Linux / BSD + +- `wmctrl` \[3\] + ### Optional dependencies: @@ -79,7 +83,6 @@ your distro's logo or any ascii art of your choice! ##### Linux / BSD -- Window Manager: `wmctrl` \[3\] - Wallpaper: `feh`, `nitrogen` or `gsettings` - Current Song: `mpc` or `cmus` - Resolution: `xorg-xdpyinfo` @@ -90,8 +93,7 @@ your distro's logo or any ascii art of your choice! \[2\] You can enable the `iTerm2` image backend by using the launch flag `--image_backend iterm2` or by
changing the config option `$image_backend` to `iterm2`. -\[3\] You should install wmctrl if the builtin window manager detection isn't working for you. The builtin
-detection works for most people and is generally faster which is why wmctrl isn't default. +\[3\] See **#71** about why this is now a required dependency. \[4\] You can use the launch flag `--scrot_cmd` or change the config option `$scrot_cmd` to your screenshot
program's cmd and fetch will use it instead of scrot. diff --git a/fetch b/fetch index 641e3670..39e1fe19 100755 --- a/fetch +++ b/fetch @@ -751,13 +751,6 @@ getwm () { if type -p wmctrl >/dev/null 2>&1; then wm="$(wmctrl -m | head -n1)" wm=${wm/Name: } - - elif [ "$XINITRC" ]; then - wm=$(grep "^[^#]*exec" "$XINITRC" | tail -n 1) - - elif [ -e "$HOME/.xinitrc" ]; then - wm=$(grep "^[^#]*exec" "${HOME}/.xinitrc" | tail -n 1) - else case "$os" in "Mac OS X") wm="Quartz Compositor" ;; From 427fc6881451049fbbf2dcf85ae5987fa921705a Mon Sep 17 00:00:00 2001 From: Dylan Date: Wed, 17 Feb 2016 00:25:34 +1100 Subject: [PATCH 2/2] Fix issue number --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 567760e4..3072adc9 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,7 @@ your distro's logo or any ascii art of your choice! \[2\] You can enable the `iTerm2` image backend by using the launch flag `--image_backend iterm2` or by
changing the config option `$image_backend` to `iterm2`. -\[3\] See **#71** about why this is now a required dependency. +\[3\] See **#75** about why this is now a required dependency. \[4\] You can use the launch flag `--scrot_cmd` or change the config option `$scrot_cmd` to your screenshot
program's cmd and fetch will use it instead of scrot.