Merge branch 'main' of github.com:binwiederhier/ntfy into main

scripts/postinst.sh

@@ -6,7 +6,8 @@ set -e
 #
 # TODO: This is only tested on Debian.
 #
-if [ "$1" = "configure" ] && [ -d /run/systemd/system ]; then
+if [ "$1" = "configure" ] || [ "$1" -ge 1 ]; then
+  if [ -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
@@ -41,3 +42,4 @@ if [ "$1" = "configure" ] && [ -d /run/systemd/system ]; then
       fi
     fi
   fi
+fi

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

scripts/preinst.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
+if [ "$1" = "install" ] || [ "$1" = "upgrade" ] || [ "$1" -ge 1 ]; then
   # Migration of old to new config file name
   oldconfigfile="/etc/ntfy/config.yml"
   configfile="/etc/ntfy/server.yml"

scripts/prerm.sh

@@ -2,7 +2,8 @@
 set -e
 
 # Stop systemd service
-if [ -d /run/systemd/system ] && [ "$1" = remove ]; then
+if [ -d /run/systemd/system ]; then
+  if [ "$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
@@ -10,3 +11,4 @@ if [ -d /run/systemd/system ] && [ "$1" = remove ]; then
       systemctl stop ntfy >/dev/null 2>&1 || true
     fi
   fi
+fi