Skip to content

Commit ea59e14

Browse files
committed
stat is better than find at these points.
1 parent a4e8bd3 commit ea59e14

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

test/test_change_owner_and_make_scripts_executable.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ touch -- "${TEST_SCRIPT}"
5151
trap -- "rm -rf ${TEST_DIR}" 0 1 2 3 6 9 14 15
5252

5353
change_owner_and_make_scripts_executable "${TEST_DIR}" 'root' && test_ok || test_fail
54-
[ $(find "${TEST_DIR}" -maxdepth 0 -printf '%u') = 'root' ] && test_ok || test_fail
55-
[ $(find "${TEST_DIR}" -maxdepth 0 -printf '%g') = 'root' ] && test_ok || test_fail
56-
[ $(find "${TEST_DIR}" -maxdepth 0 -printf '%m') -eq 755 ] && test_ok || test_fail
57-
[ $(find "${TEST_FILE}" -maxdepth 0 -printf '%u') = 'root' ] && test_ok || test_fail
58-
[ $(find "${TEST_FILE}" -maxdepth 0 -printf '%g') = 'root' ] && test_ok || test_fail
59-
[ $(find "${TEST_FILE}" -maxdepth 0 -printf '%m') -eq 644 ] && test_ok || test_fail
60-
[ $(find "${TEST_SCRIPT}" -maxdepth 0 -printf '%u') = 'root' ] && test_ok || test_fail
61-
[ $(find "${TEST_SCRIPT}" -maxdepth 0 -printf '%g') = 'root' ] && test_ok || test_fail
62-
[ $(find "${TEST_SCRIPT}" -maxdepth 0 -printf '%m') -eq 744 ] && test_ok || test_fail
54+
[ $(stat --printf='%U' -- "${TEST_DIR}") = 'root' ] && test_ok || test_fail
55+
[ $(stat --printf='%G' -- "${TEST_DIR}") = 'root' ] && test_ok || test_fail
56+
[ $(stat --printf='%a' -- "${TEST_DIR}") -eq 755 ] && test_ok || test_fail
57+
[ $(stat --printf='%U' -- "${TEST_FILE}") = 'root' ] && test_ok || test_fail
58+
[ $(stat --printf='%G' -- "${TEST_FILE}") = 'root' ] && test_ok || test_fail
59+
[ $(stat --printf='%a' -- "${TEST_FILE}") -eq 644 ] && test_ok || test_fail
60+
[ $(stat --printf='%U' -- "${TEST_SCRIPT}") = 'root' ] && test_ok || test_fail
61+
[ $(stat --printf='%G' -- "${TEST_SCRIPT}") = 'root' ] && test_ok || test_fail
62+
[ $(stat --printf='%a' -- "${TEST_SCRIPT}") -eq 744 ] && test_ok || test_fail

test/test_create_directory.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@ trap -- "rmdir -p --ignore-fail-on-non-empty -- ${TEST_DIR}" 0 1 2 3 6 9 14 15
4646

4747
create_directory "${TEST_DIR}" 'root' && test_ok || test_fail
4848
[ -d "${TEST_DIR}" ] && test_ok || test_fail
49-
[ $(find "${TEST_DIR}" -maxdepth 0 -printf '%u') = 'root' ] && test_ok || test_fail
50-
[ $(find "${TEST_DIR}" -maxdepth 0 -printf '%g') = 'root' ] && test_ok || test_fail
51-
[ $(find "${TEST_DIR}" -maxdepth 0 -printf '%m') -eq 550 ] && test_ok || test_fail
49+
[ $(stat --printf='%U' -- "${TEST_DIR}") = 'root' ] && test_ok || test_fail
50+
[ $(stat --printf='%G' -- "${TEST_DIR}") = 'root' ] && test_ok || test_fail
51+
[ $(stat --printf='%a' -- "${TEST_DIR}") -eq 550 ] && test_ok || test_fail

test/test_create_init_script.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,6 @@ trap -- "rm -f -- ${EXPECTED} ${ACTUAL}" 0 1 2 3 6 9 14 15
7474
create_init_script "${ACTUAL}" "${WD}" 'example.com localhost'
7575

7676
diff -- "${ACTUAL}" "${EXPECTED}" && test_ok || test_fail
77-
[ $(find "${ACTUAL}" -maxdepth 0 -printf '%u') = 'root' ] && test_ok || test_fail
78-
[ $(find "${ACTUAL}" -maxdepth 0 -printf '%g') = 'root' ] && test_ok || test_fail
79-
[ $(find "${ACTUAL}" -maxdepth 0 -printf '%m') -eq 755 ] && test_ok || test_fail
77+
[ $(stat --printf='%U' -- "${ACTUAL}") = 'root' ] && test_ok || test_fail
78+
[ $(stat --printf='%G' -- "${ACTUAL}") = 'root' ] && test_ok || test_fail
79+
[ $(stat --printf='%a' -- "${ACTUAL}") -eq 755 ] && test_ok || test_fail

0 commit comments

Comments
 (0)