[pacman-dev] [PATCH] contrib/pacdiff: error if diffprog is not found

Allan McRae allan at archlinux.org
Mon Oct 14 02:12:38 EDT 2013


FS#35936

Signed-off-by: Allan McRae <allan at archlinux.org>
---
 contrib/pacdiff.sh.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in
index 711763b..6e70fee 100644
--- a/contrib/pacdiff.sh.in
+++ b/contrib/pacdiff.sh.in
@@ -116,6 +116,11 @@ done
 
 m4_include(../scripts/library/term_colors.sh)
 
+if ! type -p $diffprog >/dev/null; then
+	error "Cannot find the $diffprog binary required for viewing differences."
+	exit 1
+fi
+
 case $(( USE_FIND + USE_LOCATE + USE_PACDB )) in
 	0) USE_PACDB=1;; # set the default search option
 	[^1]) error "Only one search option may be used at a time"
-- 
1.8.4



More information about the pacman-dev mailing list