From 9a2dc2618e4875b59a19709ec810402ce7d5df28 Mon Sep 17 00:00:00 2001 From: krisdoodle45 <86745210+krisdoodle45@users.noreply.github.com> Date: Tue, 31 Aug 2021 23:00:23 +0200 Subject: [PATCH] Return dunst and zathura color schemes to normal if python-pywal is uninstalled. (#995) * Changed paru to yay due to new LARBS changes * Fix & improve lf's moveto, copyto and cd to bm-dir When using any of the above functions they returned exit code 1. This was due to the cut command having tab as the delimiter, but spaces are used in the bm-dirs file. As an improvement comments are now automatically removed from the fzf options, because selecting those wouldn't work anyway. The final sed command substituting "~" for "$HOME" is also removed because that doesn't seem to do anything looking at the current structure of the bm-dirs file. The J bind needed more parsing and environment variable substitution because cd didn't work by default with values from a subshell. * Automatically backup existing config files * Return by pywal edited config files to normal if pywal is uninstalled. --- .config/wal/postrun | 2 ++ .local/bin/setbg | 11 ++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.config/wal/postrun b/.config/wal/postrun index 74d551b..85d9e3f 100755 --- a/.config/wal/postrun +++ b/.config/wal/postrun @@ -4,6 +4,8 @@ source "${HOME}/.cache/wal/colors.sh" mkdir -p "${HOME}/.config/dunst" mkdir -p "${HOME}/.config/zathura" +mv -n "${HOME}/.config/dunst/dunstrc" "${HOME}/.config/dunst/dunstrc.bak" +mv -n "${HOME}/.config/zathura/zathurarc" "${HOME}/.config/zathura/zathurarc.bak" ln -sf "${HOME}/.cache/wal/dunstrc" "${HOME}/.config/dunst/dunstrc" ln -sf "${HOME}/.cache/wal/zathurarc" "${HOME}/.config/zathura/zathurarc" diff --git a/.local/bin/setbg b/.local/bin/setbg index 8112bcd..7f997b7 100755 --- a/.local/bin/setbg +++ b/.local/bin/setbg @@ -17,8 +17,13 @@ case "$(file --mime-type -b "$trueloc")" in esac # If pywal is installed, use it. -command -v wal >/dev/null 2>&1 && - wal -i "$trueloc" -o "${XDG_CONFIG_HOME:-$HOME/.config}/wal/postrun" >/dev/null 2>&1 && - pidof dwm >/dev/null && xdotool key super+F12 +if command -v wal >/dev/null 2>&1 ; then + wal -i "$(readlink -f $bgloc)" -o "${XDG_CONFIG_HOME:-$HOME/.config}/wal/postrun" >/dev/null 2>&1 && + pidof dwm >/dev/null && xdotool key super+F12 +# If pywal is removed, return config files to normal. +else + [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/dunst/dunstrc.bak" ] && unlink "${XDG_CONFIG_HOME:-$HOME/.config}/dunst/dunstrc" && mv "${XDG_CONFIG_HOME:-$HOME/.config}/dunst/dunstrc.bak" "${XDG_CONFIG_HOME:-$HOME/.config}/dunst/dunstrc" + [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/zathura/zathurarc.bak" ] && unlink "${XDG_CONFIG_HOME:-$HOME/.config}/zathura/zathurarc" && mv "${XDG_CONFIG_HOME:-$HOME/.config}/zathura/zathurarc.bak" "${XDG_CONFIG_HOME:-$HOME/.config}/zathura/zathurarc" +fi xwallpaper --zoom "$bgloc"