Cosmetically harmonizing diversion handling in maintainer scripts for better readability.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
3a86e15150
commit
76a846cf2b
2 changed files with 25 additions and 18 deletions
4
debian/zutils.postrm
vendored
4
debian/zutils.postrm
vendored
|
@ -6,8 +6,8 @@ case "${1}" in
|
||||||
remove)
|
remove)
|
||||||
for FILE in zcat zcmp zdiff zegrep zfgrep zgrep
|
for FILE in zcat zcmp zdiff zegrep zfgrep zgrep
|
||||||
do
|
do
|
||||||
dpkg-divert --package zutils --quiet --remove --rename --divert "/usr/bin/$FILE.gzip" "/usr/bin/$FILE"
|
dpkg-divert --package zutils --quiet --remove --rename --divert "/usr/bin/${FILE}.gzip" "/usr/bin/${FILE}"
|
||||||
dpkg-divert --package zutils --quiet --remove --rename --divert "/bin/$FILE.gzip.usr-is-merged" "/bin/$FILE"
|
dpkg-divert --package zutils --quiet --remove --rename --divert "/bin/${FILE}.gzip.usr-is-merged" "/bin/${FILE}"
|
||||||
dpkg-divert --package zutils --quiet --remove --rename --divert /usr/share/man/man1/${FILE}.gzip.1.gz /usr/share/man/man1/${FILE}.1.gz
|
dpkg-divert --package zutils --quiet --remove --rename --divert /usr/share/man/man1/${FILE}.gzip.1.gz /usr/share/man/man1/${FILE}.1.gz
|
||||||
done
|
done
|
||||||
;;
|
;;
|
||||||
|
|
39
debian/zutils.preinst
vendored
39
debian/zutils.preinst
vendored
|
@ -8,8 +8,8 @@ case "${1}" in
|
||||||
install)
|
install)
|
||||||
for FILE in zcat zcmp zdiff zegrep zfgrep zgrep
|
for FILE in zcat zcmp zdiff zegrep zfgrep zgrep
|
||||||
do
|
do
|
||||||
dpkg-divert --package zutils --quiet --add --rename --divert "/usr/bin/$FILE.gzip" "/usr/bin/$FILE"
|
dpkg-divert --package zutils --quiet --add --rename --divert "/usr/bin/${FILE}.gzip" "/usr/bin/${FILE}"
|
||||||
dpkg-divert --package zutils --quiet --add --rename --divert "/bin/$FILE.gzip.usr-is-merged" "/bin/$FILE"
|
dpkg-divert --package zutils --quiet --add --rename --divert "/bin/${FILE}.gzip.usr-is-merged" "/bin/${FILE}"
|
||||||
dpkg-divert --package zutils --quiet --add --rename --divert /usr/share/man/man1/${FILE}.gzip.1.gz /usr/share/man/man1/${FILE}.1.gz
|
dpkg-divert --package zutils --quiet --add --rename --divert /usr/share/man/man1/${FILE}.gzip.1.gz /usr/share/man/man1/${FILE}.1.gz
|
||||||
done
|
done
|
||||||
;;
|
;;
|
||||||
|
@ -17,21 +17,28 @@ case "${1}" in
|
||||||
upgrade)
|
upgrade)
|
||||||
for FILE in zcat zcmp zdiff zegrep zfgrep zgrep
|
for FILE in zcat zcmp zdiff zegrep zfgrep zgrep
|
||||||
do
|
do
|
||||||
TRUENAME=$(dpkg-divert --truename "/usr/bin/$FILE")
|
TRUENAME=$(dpkg-divert --truename "/usr/bin/${FILE}")
|
||||||
if test "$TRUENAME" = "/usr/bin/$FILE.usr-is-merged"; then
|
|
||||||
|
if [ "${TRUENAME}" = "/usr/bin/${FILE}.usr-is-merged" ]
|
||||||
|
then
|
||||||
# gzip.preinst duplicated the diversion for us
|
# gzip.preinst duplicated the diversion for us
|
||||||
dpkg-divert --package zutils --quiet --remove --no-rename --divert "/usr/bin/$FILE.usr-is-merged" "/usr/bin/$FILE"
|
dpkg-divert --package zutils --quiet --remove --no-rename --divert "/usr/bin/${FILE}.usr-is-merged" "/usr/bin/${FILE}"
|
||||||
dpkg-divert --package zutils --quiet --remove --no-rename "/bin/$FILE"
|
dpkg-divert --package zutils --quiet --remove --no-rename "/bin/${FILE}"
|
||||||
dpkg-divert --package zutils --quiet --add --no-rename --divert "/usr/bin/$FILE.gzip" "/usr/bin/$FILE"
|
dpkg-divert --package zutils --quiet --add --no-rename --divert "/usr/bin/${FILE}.gzip" "/usr/bin/${FILE}"
|
||||||
dpkg-divert --package zutils --quiet --add --no-rename --divert "/bin/$FILE.gzip.usr-is-merged" "/bin/$FILE"
|
dpkg-divert --package zutils --quiet --add --no-rename --divert "/bin/${FILE}.gzip.usr-is-merged" "/bin/${FILE}"
|
||||||
elif test "$TRUENAME" != "/usr/bin/$FILE.gzip"; then
|
elif [ "${TRUENAME}" != "/usr/bin/${FILE}.gzip" ]
|
||||||
dpkg-divert --package zutils --quiet --add --no-rename --divert "/usr/bin/$FILE.gzip" "/usr/bin/$FILE"
|
then
|
||||||
TRUENAME=$(dpkg-divert --truename "/bin/$FILE")
|
dpkg-divert --package zutils --quiet --add --no-rename --divert "/usr/bin/${FILE}.gzip" "/usr/bin/${FILE}"
|
||||||
if test "$TRUENAME" != "/bin/$FILE.gzip.usr-is-merged"; then
|
|
||||||
dpkg-divert --package zutils --quiet --remove --no-rename "/bin/$FILE"
|
TRUENAME=$(dpkg-divert --truename "/bin/${FILE}")
|
||||||
dpkg-divert --package zutils --quiet --add --no-rename --divert "/bin/$FILE.gzip.usr-is-merged" "/bin/$FILE"
|
|
||||||
if test -e "$DPKG_ROOT$TRUENAME" -o -h "$DPKG_ROOT$TRUENAME"; then
|
if [ "${TRUENAME}" != "/bin/${FILE}.gzip.usr-is-merged" ]
|
||||||
mv "$DPKG_ROOT$TRUENAME" "$DPKG_ROOT/bin/$FILE.gzip.usr-is-merged"
|
then
|
||||||
|
dpkg-divert --package zutils --quiet --remove --no-rename "/bin/${FILE}"
|
||||||
|
dpkg-divert --package zutils --quiet --add --no-rename --divert "/bin/${FILE}.gzip.usr-is-merged" "/bin/${FILE}"
|
||||||
|
if [ -e "${DPKG_ROOT}${TRUENAME}" ] || [ -h "${DPKG_ROOT}${TRUENAME}" ]
|
||||||
|
then
|
||||||
|
mv "${DPKG_ROOT}${TRUENAME}" "${DPKG_ROOT}/bin/${FILE}.gzip.usr-is-merged"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Add table
Reference in a new issue