diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-01-03 02:16:44 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-01-03 02:16:44 -0500 |
| commit | 52cc0c3ff27d4c48d3461d9fd898367aa4a92631 (patch) | |
| tree | f4d2b4fcfbc1c6cda116b7723ebe2eee774b0cd6 /src/abslibre-tools/diff-unfree | |
| parent | 3793e4fac9d1d853251e84838caa2b8849d1f32b (diff) | |
| parent | 58e2a9cd5aa9a4eb80f8da675685f62aca128eb3 (diff) | |
Merge branch 'master' into xbs
Conflicts:
src/lib/conf.sh
Diffstat (limited to 'src/abslibre-tools/diff-unfree')
| -rwxr-xr-x | src/abslibre-tools/diff-unfree | 4 |
1 files changed, 2 insertions, 2 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 } |