diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-12-20 10:23:35 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-12-20 10:26:14 +0000 |
| commit | 82f177ae51239a65c9eded4055258731185480f2 (patch) | |
| tree | 24c1309e249d3f16b5f3a836751895c1d3f82832 /debian | |
| parent | Applying patch from Helmut Grohne <helmut@subdivi.de> to duplicate diversion ... (diff) | |
| download | progress-linux-metapackages-82f177ae51239a65c9eded4055258731185480f2.tar.xz progress-linux-metapackages-82f177ae51239a65c9eded4055258731185480f2.zip | |
Cosmetically harmonizing diversion handling in bfh-container maintainer scripts for better readability.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/progress-linux-container.postrm | 4 | ||||
| -rwxr-xr-x | debian/progress-linux-container.preinst | 51 |
2 files changed, 33 insertions, 22 deletions
diff --git a/debian/progress-linux-container.postrm b/debian/progress-linux-container.postrm index f992a6c..effe465 100755 --- a/debian/progress-linux-container.postrm +++ b/debian/progress-linux-container.postrm @@ -6,12 +6,12 @@ case "${1}" in remove) for FILE in halt poweroff reboot shutdown coldreboot do - dpkg-divert --package progress-linux-container --quiet --remove --rename --divert "/lib/container/divert/$FILE.orig.usr-is-merged" "/sbin/$FILE" + dpkg-divert --package progress-linux-container --quiet --remove --rename --divert "/lib/container/divert/${FILE}.orig.usr-is-merged" "/sbin/${FILE}" done for FILE in halt poweroff reboot shutdown coldreboot pm-hibernate pm-suspend pm-suspend-hybrid do - dpkg-divert --package progress-linux-container --quiet --remove --rename --divert "/usr/lib/container/divert/$FILE.orig" "/usr/sbin/$FILE" + dpkg-divert --package progress-linux-container --quiet --remove --rename --divert "/usr/lib/container/divert/${FILE}.orig" "/usr/sbin/${FILE}" done ;; diff --git a/debian/progress-linux-container.preinst b/debian/progress-linux-container.preinst index 499595b..066bb57 100755 --- a/debian/progress-linux-container.preinst +++ b/debian/progress-linux-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 progress-linux-container --quiet --add "$RENAME_FLAG" --divert "/usr/lib/container/divert/$FILE.orig" "/usr/sbin/$FILE" + + dpkg-divert --package progress-linux-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 progress-linux-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 progress-linux-container --quiet --remove --no-rename "/sbin/$FILE" - dpkg-divert --package progress-linux-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 progress-linux-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 progress-linux-container --quiet --remove --no-rename "/sbin/${FILE}" + dpkg-divert --package progress-linux-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 progress-linux-container --quiet --remove --no-rename "/usr/sbin/$FILE" - dpkg-divert --package progress-linux-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 progress-linux-container --quiet --remove --no-rename "/usr/sbin/${FILE}" + dpkg-divert --package progress-linux-container --quiet --add --no-rename --divert "/usr/lib/container/divert/${FILE}.orig" "/usr/sbin/${FILE}" else - dpkg-divert --package progress-linux-container --quiet --add --rename --divert "/usr/lib/container/divert/$FILE.orig" "/usr/sbin/$FILE" + dpkg-divert --package progress-linux-container --quiet --add --rename --divert "/usr/lib/container/divert/${FILE}.orig" "/usr/sbin/${FILE}" fi done ;; |