Bläddra i källkod

Adjust RPM scriptlets to work on RHEL-flavour OSes, too.

Christian Meis 4 år sedan
förälder
incheckning
88586c8f86
4 ändrade filer med 4 tillägg och 4 borttagningar
  1. 1 1
      scripts/postinst.sh
  2. 1 1
      scripts/postrm.sh
  3. 1 1
      scripts/preinst.sh
  4. 1 1
      scripts/prerm.sh

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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"

+ 1 - 1
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