From 8bb66e05111d6906295fa7246a658c514d1a19ef Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Mon, 3 Jul 2023 11:42:22 +0200 Subject: [PATCH] capture cmp(1) error output --- CHANGELOG.md | 1 + minifirewall | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c79d36f..e34ef84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ and this project **does not adhere to [Semantic Versioning](http://semver.org/sp ### Changed * extract "include_files" function +* capture cmp(1) error output ### Deprecated diff --git a/minifirewall b/minifirewall index 259770e..e9f938a 100755 --- a/minifirewall +++ b/minifirewall @@ -285,7 +285,7 @@ check_unpersisted_state() { rm -f "${STATE_FILE_DIFF}" if [ -f "${STATE_FILE_LATEST}" ]; then - cmp_result=$(cmp "${STATE_FILE_LATEST}" "${STATE_FILE_CURRENT}") + cmp_result=$(cmp "${STATE_FILE_LATEST}" "${STATE_FILE_CURRENT}" 2>&1) cmp_rc=$? if [ ${cmp_rc} -eq 0 ]; then @@ -326,7 +326,7 @@ report_state_changes() { # But if there is a previous known state # let's compare with the new known state if [ -f "${STATE_FILE_PREVIOUS}" ]; then - cmp_result=$(cmp "${STATE_FILE_PREVIOUS}" "${STATE_FILE_LATEST}") + cmp_result=$(cmp "${STATE_FILE_PREVIOUS}" "${STATE_FILE_LATEST}" 2>&1) cmp_rc=$? if [ ${cmp_rc} -eq 0 ]; then