From: Mike Kelly <pioto@gentoo.org>
Date: Tue, 13 Mar 2007 01:07:08 +0000 (+0000)
Subject: Don't use `which`, use `type -P`.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e46d074d3b7d76dd114da3e6920a762f3529df7a;p=gentoo.git

Don't use `which`, use `type -P`.
---

diff --git a/eclass/vim-doc.eclass b/eclass/vim-doc.eclass
index 0571980d4619..7bb6cd05feb0 100644
--- a/eclass/vim-doc.eclass
+++ b/eclass/vim-doc.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim-doc.eclass,v 1.12 2006/10/25 20:18:53 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim-doc.eclass,v 1.13 2007/03/13 01:07:08 pioto Exp $
 #
 # This eclass is used by vim.eclass and vim-plugin.eclass to update
 # the documentation tags.  This is necessary since vim doesn't look in
@@ -20,9 +20,9 @@ update_vim_helptags() {
 
 	if [[ $PN != vim-core ]]; then
 		# Find a suitable vim binary for updating tags :helptags
-		vim=$(which vim 2>/dev/null)
-		[[ -z "$vim" ]] && vim=$(which gvim 2>/dev/null)
-		[[ -z "$vim" ]] && vim=$(which kvim 2>/dev/null)
+		vim=$(type -P vim 2>/dev/null)
+		[[ -z "$vim" ]] && vim=$(type -P gvim 2>/dev/null)
+		[[ -z "$vim" ]] && vim=$(type -P kvim 2>/dev/null)
 		if [[ -z "$vim" ]]; then
 			ewarn "No suitable vim binary to rebuild documentation tags"
 		fi
diff --git a/eclass/vim.eclass b/eclass/vim.eclass
index d6d93b0e5f44..b51784a6f219 100644
--- a/eclass/vim.eclass
+++ b/eclass/vim.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.160 2007/02/22 03:23:38 pioto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.161 2007/03/13 01:07:08 pioto Exp $
 
 # Authors:
 # 	Ryan Phillips <rphillips@gentoo.org>
@@ -468,7 +468,7 @@ vim_src_compile() {
 
 	# Let Portage do the stripping. Some people like that.
 	if version_is_at_least "7.0_beta" ; then
-		export ac_cv_prog_STRIP="$(which true ) faking strip"
+		export ac_cv_prog_STRIP="$(type -P true ) faking strip"
 	fi
 
 	myconf="${myconf} --with-modified-by=Gentoo-${PVR}"