From 0a520e5ee483fc280abe8308efbfcdd126f74d30 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 18 Sep 2005 04:38:36 +0000
Subject: add a sanity check for diff before using it #48184

svn path=/main/branches/2.0/; revision=1998
---
 bin/etc-update | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'bin')

diff --git a/bin/etc-update b/bin/etc-update
index fb09ea9d0..24af6dccc 100755
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -12,11 +12,9 @@
 
 export PORTAGE_CALLER="etc-update"
 
-eval $(python -c 'import portage; print "export PORTAGE_TMPDIR="+portage.settings["PORTAGE_TMPDIR"]; print "export USERLAND="+portage.settings["USERLAND"]')
+eval $(python -c 'import portage; print "export PORTAGE_TMPDIR="+portage.settings["PORTAGE_TMPDIR"];')
 
-if [ "$USERLAND" == "BSD" ] ; then
-	function sed() { gsed "$@"; }
-elif [ "$USERLAND" == "Darwin" ] && [ -x /bin/gsed ]; then
+if type -p gsed >/dev/null ; then
 	function sed() { gsed "$@"; }
 fi
 
@@ -38,6 +36,12 @@ function scan() {
 	count=0
 	input=0
 	
+	# Sanity check to make sure diff exists and works
+	if ! diff -v &>/dev/null ; then
+		echo "ERROR: 'diff' does not seem to work, aborting"
+		exit 1
+	fi
+
 	for path in ${CONFIG_PROTECT}; do if [ -d ${path} ]; then
 		ofile=""
 		for file in `find ${path}/ -iname "._cfg????_*" |
-- 
cgit v1.2.3-1-g7c22