Switch from parentheses to nested if statements for the RPM scriptlets.

This commit is contained in:
Christian Meis 2022-01-05 14:43:25 +01:00
parent 88586c8f86
commit 523e037900
2 changed files with 33 additions and 29 deletions

View file

@ -6,7 +6,8 @@ set -e
# #
# TODO: This is only tested on Debian. # TODO: This is only tested on Debian.
# #
if ( [ "$1" = "configure" ] || [ "$1" = "1" ] ) && [ -d /run/systemd/system ]; then if [ "$1" = "configure" ] || [ "$1" = "1" ]; then
if [ -d /run/systemd/system ]; then
# Create ntfy user/group # Create ntfy user/group
id ntfy >/dev/null 2>&1 || useradd --system --no-create-home ntfy id ntfy >/dev/null 2>&1 || useradd --system --no-create-home ntfy
chown ntfy.ntfy /var/cache/ntfy chown ntfy.ntfy /var/cache/ntfy
@ -40,4 +41,5 @@ if ( [ "$1" = "configure" ] || [ "$1" = "1" ] ) && [ -d /run/systemd/system ]; t
systemctl restart ntfy-client.service >/dev/null || true systemctl restart ntfy-client.service >/dev/null || true
fi fi
fi fi
fi
fi fi

View file

@ -2,11 +2,13 @@
set -e set -e
# Stop systemd service # Stop systemd service
if [ -d /run/systemd/system ] && ( [ "$1" = remove ] || [ "$1" = "0" ] ); then if [ -d /run/systemd/system ]; then
if [ "$1" = remove ] || [ "$1" = "0" ]; then
echo "Stopping ntfy.service ..." echo "Stopping ntfy.service ..."
if [ -x /usr/bin/deb-systemd-invoke ]; then if [ -x /usr/bin/deb-systemd-invoke ]; then
deb-systemd-invoke stop 'ntfy.service' >/dev/null || true deb-systemd-invoke stop 'ntfy.service' >/dev/null || true
else else
systemctl stop ntfy >/dev/null 2>&1 || true systemctl stop ntfy >/dev/null 2>&1 || true
fi fi
fi
fi fi