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