diff options
Diffstat (limited to 'src/abslibre-tools/diff-unfree')
| -rwxr-xr-x | src/abslibre-tools/diff-unfree | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/abslibre-tools/diff-unfree b/src/abslibre-tools/diff-unfree index 07f2ca2..af5bbe5 100755 --- a/src/abslibre-tools/diff-unfree +++ b/src/abslibre-tools/diff-unfree @@ -1,7 +1,7 @@ #!/usr/bin/env bash # This script will help you diff a *-libre PKGBUILD against the unfree one # to check for updates. -# Copyright 2010 Nicolás Reynolds +# Copyright (C) 2010 Nicolás Reynolds # ---------- GNU General Public License 3 ---------- @@ -23,16 +23,14 @@ . libremessages . $(librelib conf.sh) load_files libretools -check_vars libretools DIFFTOOL || exit 1 - -cmd=${0##*/} +check_vars libretools DIFFPROG || exit 1 usage() { - echo "Usage: $cmd [community|packages] [unfree-package] [repo]" - echo "Usage: $cmd --help" - echo "Helps you diff build scripts from ABSLibre against (Unfree) ABS." - echo "" - echo "Package name and repo will we guessed if you don't specify them." + print "Usage: %s [community|packages] [unfree-package] [repo]" "${0##*/}" + print "Usage: %s --help" "${0##*/}" + prose "Helps you diff build scripts from ABSLibre against (Unfree) ABS." + echo + prose "Package name and repo will we guessed if you don't specify them." } main() { @@ -68,7 +66,7 @@ main() { pushd "${tmp_dir}" &>/dev/null - msg "Getting diff from $repo/$package..." + msg "Getting diff from %s..." "$repo/$package" svn checkout --depth=empty svn://svn.archlinux.org/$svnrepo &>/dev/null @@ -81,8 +79,8 @@ main() { msg "Diffing files" for _file in ${unfree_dir}/*; do - msg2 "$(basename "${_file}")" - ${DIFFTOOL} "$PWD/$(basename "${_file}")" "${_file}" + msg2 "%s" "$(basename "${_file}")" + ${DIFFPROG} "$PWD/$(basename "${_file}")" "${_file}" done } |