From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 15 Dec 2005 18:58:20 +0000 (+0000)
Subject: Port to pre-POSIX shells like Solaris 8 /bin/sh.
X-Git-Tag: v6.0~1106
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b7c426c0ab71127c57296139abd6065dad151a7f;p=thirdparty%2Fcoreutils.git

Port to pre-POSIX shells like Solaris 8 /bin/sh.
Don't assume /etc/passwd contains user names; use 'id' instead.
---

diff --git a/tests/acl b/tests/acl
index 2e232ee016..fdef618c43 100644
--- a/tests/acl
+++ b/tests/acl
@@ -1,18 +1,16 @@
-if ! getfacl --version 2> /dev/null 1>&2 || \
-   ! setfacl --version 2> /dev/null 1>&2 ; then
+getfacl --version 2> /dev/null 1>&2 && setfacl --version 2> /dev/null 1>&2 || {
   cat <<EOF 1>&2
 **************************************
 $0: This test requires getfacl and setfacl.
 **************************************
 EOF
   (exit 77); exit 77
-fi
+}
 
-if ! grep '^bin:' /etc/passwd 2> /dev/null 1>&2 ; then
+id -u bin 2> /dev/null 1>&2 || {
   cat <<EOF 1>&2
 **************************************
 $0: This test requires a local user named bin.
 **************************************
 EOF
-  (exit 77); exit 77
-fi
+}