From 93c3357b51535961c42f711e19a7127a623d180e Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 31 Dec 2014 19:42:26 -0500 Subject: librefetch.conf: only select a graphical DIFFPROG if DISPLAY is set. There was a request on the bug tracker a while ago to not include graphical programs in the list searched, as sometimes they used libretools without X. We closed it as WONTFIX because it's a configuration option; if you don't like the default value, then set it to something different. But, checking for DISPLAY is trivial, and probably makes more people happy out-of-the-box, which is good. I don't know why I didn't think of it then. --- src/libretools.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/libretools.conf b/src/libretools.conf index ba27232..d68d75b 100644 --- a/src/libretools.conf +++ b/src/libretools.conf @@ -12,7 +12,7 @@ BLACKLIST=https://projects.parabola.nu/blacklist.git/plain/blacklist.txt ## Diff tool (vimdiff, gvimdiff, meld, etc) ## Used by `aur`, `diff-unfree` -DIFFPROG=`which kdiff3 meld gvimdiff vimdiff colordiff diff 2>/dev/null|sed 's/\s.*//;1q'` +DIFFPROG=$(which $([ -z "${DISPLAY:-}" ]||echo kdiff3 meld gvimdiff) vimdiff colordiff diff 2>/dev/null|sed 's/\s.*//;1q') ## The repos you'll be packaging for ## Used by `toru` -- cgit v1.2.3-54-g00ecf