From 1845ef07f7082b0e0483d2b66e7f55aa56074757 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 6 Oct 2025 18:10:57 +0200
Subject: usr-lib-nagios-plugins/check_needs-rebooting.sh: Refactor output.

---
 usr-lib-nagios-plugins/check_needs-rebooting.sh | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/usr-lib-nagios-plugins/check_needs-rebooting.sh b/usr-lib-nagios-plugins/check_needs-rebooting.sh
index 135aba8..9a9495c 100755
--- a/usr-lib-nagios-plugins/check_needs-rebooting.sh
+++ b/usr-lib-nagios-plugins/check_needs-rebooting.sh
@@ -149,7 +149,11 @@ function CheckDebianRebootRequired() {
 				EXIT_MSG=$OK_MSG
 				EXIT_CODE=$OK_EXIT_CODE
 			fi
-			EXIT_MSG_BODY="`cat ${REBOOT_REQUIRED_PATH}`\nPackages:\n`cat ${REBOOT_REQUIRED_PKGS_PATH} | sed ':a;N;$!ba;s/\n/, /g'`|Packages=${NR_OF_PACKAGES};${WARNING_LEVEL//-1/};${CRITICAL_LEVEL//-1/};0"
+			EXIT_MSG_BODY="`cat ${REBOOT_REQUIRED_PATH}`"
+			if [[ -n "${EXIT_MSG_BODY}" ]]; then
+				EXIT_MSG_BODY="${EXIT_MSG_BODY}\n\n"
+			fi
+			EXIT_MSG_BODY="${EXIT_MSG_BODY}Packages:\n`cat ${REBOOT_REQUIRED_PKGS_PATH} | sed -e '/^\$/d'`|Packages=${NR_OF_PACKAGES};${WARNING_LEVEL//-1/};${CRITICAL_LEVEL//-1/};0"
 		else
 			if [[ ${STATUS} = "w" ]]; then
 				EXIT_MSG=$WARNING_MSG
@@ -255,5 +259,13 @@ case `distro_name` in
 esac
 
 # Echo message and exit
-echo "${EXIT_MSG}: ${EXIT_MSG_BODY}"
+PACKAGES="packages need to be upgraded"
+if [[ "x${NR_OF_PACKAGES}" = "x1" ]]; then
+	PACKAGES="package needs to be upgraded"
+fi
+if [[ ${NR_OF_PACKAGES} -gt 0 ]]; then
+	echo -e "${EXIT_MSG}: ${NR_OF_PACKAGES} ${PACKAGES}\n${EXIT_MSG_BODY}"
+else
+	echo -e "${EXIT_MSG}: ${EXIT_MSG_BODY}"
+fi
 exit $EXIT_CODE
-- 
cgit v1.2.3