Merge branch 'master' into xbs

Conflicts:
	src/lib/conf.sh

1 files changed, 9 insertions, 9 deletions

diff --git a/src/aur b/src/aur
index 6fce891..2d1efbb 100755
--- a/src/aur
+++ b/src/aur
@@ -20,15 +20,15 @@
 
 . libremessages
 
-cmd=${0##*/}
 usage() {
-	echo "Usage: $cmd [-h] pkgname-from-aur1 [pkgname-from-aur2 ...]"
+	print "Usage: %s [-h] PKGNAME [PKGNAME2 PKGNAME3...]" "${0##*/}"
+	print "Downloads packages from the AUR, and does basic freedom checks."
 	echo
-	echo "This script will download packages from AUR to the current"
-	echo "directory and check their license for nonfree issues.  This does"
-	echo "not mean that they are free; they may be incorrectly labeled, or"
-	echo "have other freedom issues.  It's a tool to help Parabola"
-	echo "packagers, not to help users install things directly from AUR."
+	prose "This script will download packages from AUR to the current
+	       directory and check their license for nonfree issues.  This does
+	       not mean that they are free; they may be incorrectly labeled, or
+	       have other freedom issues.  It's a tool to help Parabola
+	       packagers, not to help users install things directly from AUR."
 }
 
 main() {
@@ -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