From 6216b10260460e324fed200c8fdae4a1a898d4b3 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 20 Dec 2023 11:11:47 +0100
Subject: Cosmetically harmonizing diversion handling in bfh-container
 maintainer scripts for better readability.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 debian/bfh-container.preinst | 51 +++++++++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 20 deletions(-)

(limited to 'debian')

diff --git a/debian/bfh-container.preinst b/debian/bfh-container.preinst
index 3bf584f..ab15a9c 100755
--- a/debian/bfh-container.preinst
+++ b/debian/bfh-container.preinst
@@ -8,35 +8,46 @@ case "${1}" in
 
 		for FILE in halt poweroff reboot shutdown coldreboot
 		do
-			TRUENAMEUSR=$(dpkg-divert --truename "/usr/sbin/$FILE")
-			TRUENAMEALIAS=$(dpkg-divert --truename "/sbin/$FILE")
-			RENAME_FLAG=--no-rename
-			if test "$TRUENAMEUSR" = "/usr/sbin/$FILE"; then
-				if test "$TRUENAMEALIAS" = "/sbin/$FILE"; then
-					RENAME_FLAG=--rename
+			TRUENAME_USR="$(dpkg-divert --truename "/usr/sbin/${FILE}")"
+			TRUENAME_ALIAS="$(dpkg-divert --truename "/sbin/${FILE}")"
+			RENAME_FLAG="--no-rename"
+
+			if [ "${TRUENAME_USR}" = "/usr/sbin/${FILE}" ]
+			then
+				if [ "${TRUENAME_ALIAS}" = "/sbin/${FILE}" ]
+				then
+					RENAME_FLAG="--rename"
 				fi
-				dpkg-divert --package bfh-container --quiet --add "$RENAME_FLAG" --divert "/usr/lib/container/divert/$FILE.orig" "/usr/sbin/$FILE"
+
+				dpkg-divert --package bfh-container --quiet --add "${RENAME_FLAG}" --divert "/usr/lib/container/divert/${FILE}.orig" "/usr/sbin/${FILE}"
 			fi
-			# DEP17 M18 duplicated diversion. Can be removed after trixie.
-			if test "$TRUENAMEALIAS" = "/sbin/$FILE"; then
-				dpkg-divert --package bfh-container --quiet --add "$RENAME_FLAG" --divert "/lib/container/divert/$FILE.orig.usr-is-merged" "/sbin/$FILE"
-			elif test "$TRUENAMEALIAS" != "/lib/container/divert/$FILE.orig.usr-is-merged"; then
-				dpkg-divert --package bfh-container --quiet --remove --no-rename "/sbin/$FILE"
-				dpkg-divert --package bfh-container --quiet --add --no-rename --divert "/lib/container/divert/$FILE.orig.usr-is-merged" "/sbin/$FILE"
-				if test -e "$TRUENAMEALIAS" || test -h "$TRUENAMEALIAS"; then
-					mv "$TRUENAMEALIAS" "/lib/container/divert/$FILE.orig.usr-is-merged"
+
+			# DEP17 M18 duplicated diversion, can be removed after trixie.
+			if [ "${TRUENAME_ALIAS}" = "/sbin/${FILE}" ]
+			then
+				dpkg-divert --package bfh-container --quiet --add "${RENAME_FLAG}" --divert "/lib/container/divert/${FILE}.orig.usr-is-merged" "/sbin/${FILE}"
+			elif [ "${TRUENAME_ALIAS}" != "/lib/container/divert/${FILE}.orig.usr-is-merged" ]
+			then
+				dpkg-divert --package bfh-container --quiet --remove --no-rename "/sbin/${FILE}"
+				dpkg-divert --package bfh-container --quiet --add --no-rename --divert "/lib/container/divert/${FILE}.orig.usr-is-merged" "/sbin/${FILE}"
+
+				if [ -e "${TRUENAME_ALIAS}" ] || [ -h "${TRUENAME_ALIAS}" ]
+				then
+					mv "${TRUENAME_ALIAS}" "/lib/container/divert/${FILE}.orig.usr-is-merged"
 				fi
 			fi
 		done
 
 		for FILE in pm-hibernate pm-suspend pm-suspend-hybrid
 		do
-			TRUENAMEUSR=$(dpkg-divert --truename "/usr/sbin/$FILE")
-			if test "$TRUENAMEUSR" = "/lib/container/divert/$FILE.orig"; then
-				dpkg-divert --package bfh-container --quiet --remove --no-rename "/usr/sbin/$FILE"
-				dpkg-divert --package bfh-container --quiet --add --no-rename --divert "/usr/lib/container/divert/$FILE.orig" "/usr/sbin/$FILE"
+			TRUENAME_USR="$(dpkg-divert --truename "/usr/sbin/${FILE}")"
+
+			if [ "${TRUENAME_USR}" = "/lib/container/divert/${FILE}.orig" ]
+			then
+				dpkg-divert --package bfh-container --quiet --remove --no-rename "/usr/sbin/${FILE}"
+				dpkg-divert --package bfh-container --quiet --add --no-rename --divert "/usr/lib/container/divert/${FILE}.orig" "/usr/sbin/${FILE}"
 			else
-				dpkg-divert --package bfh-container --quiet --add --rename --divert "/usr/lib/container/divert/$FILE.orig" "/usr/sbin/$FILE"
+				dpkg-divert --package bfh-container --quiet --add --rename --divert "/usr/lib/container/divert/${FILE}.orig" "/usr/sbin/${FILE}"
 			fi
 		done
 		;;
-- 
cgit v1.2.3