From 6615901d5c634b42a754be0c28032b5774c094e1 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Sat, 17 May 2025 15:49:56 +0200 Subject: [PATCH] Fix. --- bookworm/scripts/diff_tagged_files.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bookworm/scripts/diff_tagged_files.sh b/bookworm/scripts/diff_tagged_files.sh index 6a05913..93358cb 100755 --- a/bookworm/scripts/diff_tagged_files.sh +++ b/bookworm/scripts/diff_tagged_files.sh @@ -20,7 +20,8 @@ compare_tagdir() { _ATTRIBUTE=$1 _FORMAT_STR=$2 _SHOULD_BE=$3 - _ACTUAL_VALUE=$(stat --format="${_FORMAT_STR}" ${_PATH_ABS}) + _MODIFIER=$4 + _ACTUAL_VALUE=$(stat --format="${_FORMAT_STR}" ${_PATH_ABS} ${_MODIFIER}) if [ "${_ACTUAL_VALUE}" != "${_SHOULD_BE}" ]; then prefixed_msg "Bad ${_ATTRIBUTE}: ${_PATH_ABS} is ${_ACTUAL_VALUE}, should be ${_SHOULD_BE}" false @@ -71,12 +72,13 @@ compare_tagdir() { else _EXPECTED_OWNERSHIP='root:root' fi + _PIPE_FETCH_X_BITS='| cut -c 4,7,10' if [ 'regular file' = "${_TYPE}" ]; then - _EXPECTED_PERMISSIONS=$(stat --format='%A' --dereference ${_PATH_REL} | cut -c 4,7,10) + _EXPECTED_PERMISSIONS=$(stat --format='%A' --dereference ${_PATH_REL} ${_PIPE_FETCH_X_BITS}) fi set +e _compare_stat 'ownership' '%U:%G' "${_EXPECTED_OWNERSHIP}"; - _compare_stat 'x permissions' '%A | cut -c 4,7,10' "${_EXPECTED_PERMISSIONS}"; + _compare_stat 'x permissions' '%A' "${_EXPECTED_PERMISSIONS}" "${_PIPE_FETCH_X_BITS}"; set -e done prefixed_msg_exit -- 2.30.2