diff options
| author | Wayne Davison <wayned@samba.org> | 2006-11-04 00:18:49 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2006-11-04 00:18:49 +0000 |
| commit | 556e03a3c9ad79698c97b27a56387e85f5f4a7b8 (patch) | |
| tree | 020cffdedb8641ef223b8f50447f08ef003d1d48 /runtests.sh | |
| parent | e4887738bbd84d225dd01554721da003ec360a77 (diff) | |
| download | android_external_rsync-556e03a3c9ad79698c97b27a56387e85f5f4a7b8.tar.gz android_external_rsync-556e03a3c9ad79698c97b27a56387e85f5f4a7b8.tar.bz2 android_external_rsync-556e03a3c9ad79698c97b27a56387e85f5f4a7b8.zip | |
Modified to recognize FreeBSD's setfacl command.
Diffstat (limited to 'runtests.sh')
| -rwxr-xr-x | runtests.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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 } |