From 62c9f66e22ee9277718e3c4065f253ee691f2391 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 15 Oct 2007 16:15:16 +0000
Subject: Bug #195949 - Use a different diff_command sanity check when
 using_editor is true.

svn path=/main/trunk/; revision=8129
---
 bin/etc-update | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'bin/etc-update')

diff --git a/bin/etc-update b/bin/etc-update
index 16fb1fae4..60a55e3b0 100755
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -517,13 +517,20 @@ declare -i mode=$(get_config mode)
 [[ -z ${mode} ]] && mode=0
 [[ -z ${pager} ]] && pager="cat"
 
-# Sanity check to make sure diff exists and works
-echo > "${TMP}"/.diff-test-1
-echo > "${TMP}"/.diff-test-2
-
-if ! diff_command "${TMP}"/.diff-test-1 "${TMP}"/.diff-test-2 &> /dev/null ; then
-	echo "ERROR: '${diff_command}' does not seem to work, aborting"
-	exit 1
+if [ "${using_editor}" == 0 ]; then
+	# Sanity check to make sure diff exists and works
+	echo > "${TMP}"/.diff-test-1
+	echo > "${TMP}"/.diff-test-2
+	
+	if ! diff_command "${TMP}"/.diff-test-1 "${TMP}"/.diff-test-2 ; then
+		echo "ERROR: '${diff_command}' does not seem to work, aborting"
+		exit 1
+	fi
+else
+	if ! type ${diff_command%% *} >/dev/null; then
+		echo "ERROR: '${diff_command}' does not seem to work, aborting"
+		exit 1
+	fi
 fi
 
 #echo "rm_opts: $rm_opts, mv_opts: $mv_opts, cp_opts: $cp_opts"
-- 
cgit v1.2.3-1-g7c22