diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-01-03 02:07:30 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-01-03 02:07:30 -0500 |
commit | 91c74601d0e6839e88074a8d2ce3fcfd347b35e5 (patch) | |
tree | 2fc9aed556fdf8d64d16d024f1b68ba5777d0d74 /src/aur | |
parent | 92ce5b8ce36f849b47b72c2e3b315abb6b6767f1 (diff) |
Phase out DIFFTOOL for DIFFPROG (issue #438)
https://labs.parabola.nu/issues/438
Diffstat (limited to 'src/aur')
-rwxr-xr-x | src/aur | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |