home · contact · privacy
Fix.
authorChristian Heller <c.heller@plomlompom.de>
Sat, 17 May 2025 13:49:56 +0000 (15:49 +0200)
committerChristian Heller <c.heller@plomlompom.de>
Sat, 17 May 2025 13:49:56 +0000 (15:49 +0200)
bookworm/scripts/diff_tagged_files.sh

index 6a0591328aecb41de46b15e5ab47189447b4df8c..93358cb23786a46cc1687777a0f1dca60664fda1 100755 (executable)
@@ -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