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

pull/86/head
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.
#
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
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" ] || [ "$1" = "1" ] ) && [ -d /run/systemd/system ]; t
fi
fi
fi
fi

View File

@ -2,7 +2,8 @@
set -e
# 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 ..."
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 ] || [ "$1" = "0" ] ); then
systemctl stop ntfy >/dev/null 2>&1 || true
fi
fi
fi