From 91c74601d0e6839e88074a8d2ce3fcfd347b35e5 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 3 Jan 2014 02:07:30 -0500 Subject: Phase out DIFFTOOL for DIFFPROG (issue #438) https://labs.parabola.nu/issues/438 --- src/aur | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/aur') 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 -- cgit v1.2.3-54-g00ecf