X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/0888952768eeaa90ba826565631847003d75b9b4..30e50494bbb057d4191e4636b963c6b7b0770ece:/runtests.sh

diff --git a/runtests.sh b/runtests.sh
index 005c22a2..3750b039 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -182,7 +182,7 @@ else
 fi    
 
 # Check if setfacl is around and if it supports the -k or -s option.
-if setfacl --help 2>/dev/null | grep ' -k,' >/dev/null; then
+if setfacl --help 2>&1 | grep ' -k,\|\[-[a-z]*k' >/dev/null; then
     setfacl_nodef='setfacl -k'
 elif setfacl -s u::7,g::5,o:5 testsuite 2>/dev/null; then
     setfacl_nodef='setfacl -s u::7,g::5,o:5'
@@ -221,7 +221,7 @@ prep_scratch() {
     [ -d "$scratchdir" ] && rm -rf "$scratchdir"
     mkdir "$scratchdir"
     # Get rid of default ACLs and dir-setgid to avoid confusing some tests.
-    $setfacl_nodef "$scratchdir"
+    $setfacl_nodef "$scratchdir" || true
     chmod g-s "$scratchdir"
     return 0
 }