From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Sun, 13 Aug 2000 21:10:49 +0000 (+0000)
Subject: Better path searching for programs we need.
X-Git-Tag: SUDO_1_6_4~261
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=641e30612fbeb67c173a75564b715411912e5a61;p=sudo

Better path searching for programs we need.
---

diff --git a/install-sh b/install-sh
index 6c70986de..f424971b5 100755
--- a/install-sh
+++ b/install-sh
@@ -19,33 +19,26 @@ STRIP=strip
 WHOAMI=whoami
 
 ##  Some systems don't support -x, so we have to use -f.
-if [ ${CHOWN} = chown ] ; then
-    if [ -f /sbin/chown ] ; then
-	CHOWN=/sbin/chown
-    elif [ -f /etc/chown ] ; then
-	CHOWN=/etc/chown
-    elif [ -f /usr/sbin/chown ] ; then
-	CHOWN=/usr/sbin/chown
-    elif [ -f /usr/etc/chown ] ; then
-	CHOWN=/usr/etc/chown
+for d in /sbin /etc /usr/sbin /usr/etc; do
+    if [ -f $d/chown ]; then
+	CHOWN=${d}/chown
+	break
     fi
-fi
+done
 
-if [ ${WHOAMI} = whoami ] ; then
-    if [ -f /usr/ucb/whoami ] ; then
-	WHOAMI=/usr/ucb/whoami
-    elif [ -f /usr/bin/whoami ] ; then
-	WHOAMI=/usr/bin/whoami
+for d in /usr/bin /usr/ucb /usr/bsd; do
+    if [ -f $d/whoami ]; then
+	WHOAMI=${d}/whoami
+	break
     fi
-fi
+done
 
-if [ ${STRIP} = strip ] ; then
-    if [ -f /usr/ccs/bin/strip ] ; then
-	STRIP=/usr/ccs/bin/strip
-    elif [ -f /usr/bin/strip ] ; then
-	STRIP=/usr/bin/strip
+for d in /usr/ccs/bin /usr/bin; do
+    if [ -f $d/strip ]; then
+	STRIP=${d}/strip
+	break
     fi
-fi
+done
 
 ##  Defaults.
 CHOWNIT=false