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 | |
| parent | 92ce5b8ce36f849b47b72c2e3b315abb6b6767f1 (diff) | |
Phase out DIFFTOOL for DIFFPROG (issue #438)
https://labs.parabola.nu/issues/438
| -rwxr-xr-x | src/abslibre-tools/diff-unfree | 4 | ||||
| -rwxr-xr-x | src/aur | 4 | ||||
| -rw-r--r-- | src/lib/conf.sh | 4 | ||||
| -rw-r--r-- | src/libretools.conf | 2 |
4 files changed, 9 insertions, 5 deletions
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 } @@ -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` |