From 88586c8f8623150014acb4d82eb5b876dd511cf5 Mon Sep 17 00:00:00 2001
From: Christian Meis <christian.meis@online-service.de>
Date: Wed, 5 Jan 2022 13:32:15 +0100
Subject: [PATCH] Adjust RPM scriptlets to work on RHEL-flavour OSes, too.
---
scripts/postinst.sh | 2 +-
scripts/postrm.sh | 2 +-
scripts/preinst.sh | 2 +-
scripts/prerm.sh | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/postinst.sh b/scripts/postinst.sh
index 4287e0c..4e47ea6 100755
--- a/scripts/postinst.sh
+++ b/scripts/postinst.sh
@@ -6,7 +6,7 @@ set -e
#
# TODO: This is only tested on Debian.
#
-if [ "$1" = "configure" ] && [ -d /run/systemd/system ]; then
+if ( [ "$1" = "configure" ] || [ "$1" = "1" ] ) && [ -d /run/systemd/system ]; then
# Create ntfy user/group
id ntfy >/dev/null 2>&1 || useradd --system --no-create-home ntfy
chown ntfy.ntfy /var/cache/ntfy
diff --git a/scripts/postrm.sh b/scripts/postrm.sh
index f34f653..10b2fd9 100755
--- a/scripts/postrm.sh
+++ b/scripts/postrm.sh
@@ -2,7 +2,7 @@
set -e
# Delete the config if package is purged
-if [ "$1" = "purge" ]; then
+if [ "$1" = "purge" ] || [ "$1" = "0" ]; then
id ntfy >/dev/null 2>&1 && userdel ntfy
rm -f /etc/ntfy/server.yml /etc/ntfy/client.yml
rmdir /etc/ntfy || true
diff --git a/scripts/preinst.sh b/scripts/preinst.sh
index d09528c..6918a14 100755
--- a/scripts/preinst.sh
+++ b/scripts/preinst.sh
@@ -1,7 +1,7 @@
#!/bin/sh
set -e
-if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
+if [ "$1" = "install" ] || [ "$1" = "upgrade" ] || [ "$1" = "1" ]; then
# Migration of old to new config file name
oldconfigfile="/etc/ntfy/config.yml"
configfile="/etc/ntfy/server.yml"
diff --git a/scripts/prerm.sh b/scripts/prerm.sh
index f366855..fc02619 100755
--- a/scripts/prerm.sh
+++ b/scripts/prerm.sh
@@ -2,7 +2,7 @@
set -e
# Stop systemd service
-if [ -d /run/systemd/system ] && [ "$1" = remove ]; then
+if [ -d /run/systemd/system ] && ( [ "$1" = remove ] || [ "$1" = "0" ] ); then
echo "Stopping ntfy.service ..."
if [ -x /usr/bin/deb-systemd-invoke ]; then
deb-systemd-invoke stop 'ntfy.service' >/dev/null || true
--
GitLab