From 91c74601d0e6839e88074a8d2ce3fcfd347b35e5 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Fri, 3 Jan 2014 02:07:30 -0500
Subject: Phase out DIFFTOOL for DIFFPROG (issue #438)

https://labs.parabola.nu/issues/438
---
 src/abslibre-tools/diff-unfree | 4 ++--
 src/aur                        | 4 ++--
 src/lib/conf.sh                | 4 ++++
 src/libretools.conf            | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/abslibre-tools/diff-unfree b/src/abslibre-tools/diff-unfree
index b3e2327..1ef0649 100755
--- a/src/abslibre-tools/diff-unfree
+++ b/src/abslibre-tools/diff-unfree
@@ -23,7 +23,7 @@
 . libremessages
 . $(librelib conf.sh)
 load_files libretools
-check_vars libretools DIFFTOOL || exit 1
+check_vars libretools DIFFPROG || exit 1
 
 usage() {
 	print "Usage: %s [community|packages] [unfree-package] [repo]" "${0##*/}"
@@ -80,7 +80,7 @@ main() {
 
 	for _file in ${unfree_dir}/*; do
 		msg2 "%s" "$(basename "${_file}")"
-		${DIFFTOOL} "$PWD/$(basename "${_file}")" "${_file}"
+		${DIFFPROG} "$PWD/$(basename "${_file}")" "${_file}"
 	done
 }
 
diff --git a/src/aur b/src/aur
index 2fc7142..2d1efbb 100755
--- a/src/aur
+++ b/src/aur
@@ -45,7 +45,7 @@ main() {
 
 	. $(librelib conf.sh)
 	load_files libretools
-	check_vars libretools DIFFTOOL || exit 1
+	check_vars libretools DIFFPROG || exit 1
 
 	local startdir="$(pwd)"
 	local missing_deps=()
@@ -88,7 +88,7 @@ main() {
 				if ! cmp -s "${copy_old}/${file}" "${copy_new}/${file}" ; then
 					warning "%s != %s" "${copy_old}/${file}" "${copy_new}/${file}"
 					diffed=true
-					"${DIFFTOOL}" "${copy_old}/${file}" "${copy_new}/${file}"
+					"${DIFFPROG}" "${copy_old}/${file}" "${copy_new}/${file}"
 				fi
 			done
 			if $diffed; then
diff --git a/src/lib/conf.sh b/src/lib/conf.sh
index 7555794..0a6fb89 100644
--- a/src/lib/conf.sh
+++ b/src/lib/conf.sh
@@ -73,6 +73,10 @@ list_envvars() {
 				PKGEXT SRCEXT \
 				GPGKEY PACKAGER
 			;;
+		libretools)
+			printf '%s\n' \
+				DIFFPROG
+			;;
 		*) :;;
 	esac
 }
diff --git a/src/libretools.conf b/src/libretools.conf
index 17f853e..ff989f0 100644
--- a/src/libretools.conf
+++ b/src/libretools.conf
@@ -12,7 +12,7 @@ BLACKLIST=https://repo.parabolagnulinux.org/docs/blacklist.txt
 
 ## Diff tool (vimdiff, gvimdiff, meld, etc)
 ## Used by `aur`, `diff-unfree`
-DIFFTOOL=`which kdiff3 meld gvimdiff vimdiff colordiff diff 2>/dev/null|sed 's/\s.*//;1q'`
+DIFFPROG=`which kdiff3 meld gvimdiff vimdiff colordiff diff 2>/dev/null|sed 's/\s.*//;1q'`
 
 ## The repos you'll be packaging for
 ## Used by `toru`, `createworkdir`
-- 
cgit v1.2.2