From 2206d54dccc6a7af09987c7abc99c57bd1cf6f71 Mon Sep 17 00:00:00 2001
From: Alexey Avramov <hakavlad@gmail.com>
Date: Fri, 20 Nov 2020 05:57:31 +0900
Subject: [PATCH] Update Makefile and DEBIAN/postinst

---
 Makefile            | 20 +++++++++-----------
 deb/DEBIAN/postinst |  1 -
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 2a8a513..4afdca2 100644
--- a/Makefile
+++ b/Makefile
@@ -93,11 +93,11 @@ units:
 	rm -fv nohang-desktop.service
 
 chcon:
-	-chcon -t systemd_unit_file_t $(DESTDIR)$(SYSTEMDUNITDIR)/nohang.service &>/dev/null
-	-chcon -t systemd_unit_file_t $(DESTDIR)$(SYSTEMDUNITDIR)/nohang-desktop.service &>/dev/null
+	chcon -t systemd_unit_file_t $(DESTDIR)$(SYSTEMDUNITDIR)/nohang.service || :
+	chcon -t systemd_unit_file_t $(DESTDIR)$(SYSTEMDUNITDIR)/nohang-desktop.service || :
 
 daemon-reload:
-	-systemctl daemon-reload
+	systemctl daemon-reload || :
 
 build_deb: base units
 
@@ -139,19 +139,17 @@ uninstall-base:
 	rm -fvr $(DESTDIR)$(SYSCONFDIR)/nohang/
 
 uninstall-units:
-	# 'make uninstall-units' must not fail with error if systemctl is unavailable or returns error
-	-systemctl stop nohang.service || true
-	-systemctl stop nohang-desktop.service || true
-	-systemctl disable nohang.service || true
-	-systemctl disable nohang-desktop.service || true
+	systemctl stop nohang.service || :
+	systemctl stop nohang-desktop.service || :
+	systemctl disable nohang.service || :
+	systemctl disable nohang-desktop.service || :
 
 	rm -fv $(DESTDIR)$(SYSTEMDUNITDIR)/nohang.service
 	rm -fv $(DESTDIR)$(SYSTEMDUNITDIR)/nohang-desktop.service
 
 uninstall-openrc:
-	# 'make uninstall-openrc' must not fail with error if openrc is unavailable or returns error
-	-rc-service nohang-desktop stop || true
-	-rc-service nohang stop || true
+	rc-service nohang-desktop stop || :
+	rc-service nohang stop || :
 
 	rm -fv $(DESTDIR)$(SYSCONFDIR)/init.d/nohang
 	rm -fv $(DESTDIR)$(SYSCONFDIR)/init.d/nohang-desktop
diff --git a/deb/DEBIAN/postinst b/deb/DEBIAN/postinst
index ee10735..9b76642 100755
--- a/deb/DEBIAN/postinst
+++ b/deb/DEBIAN/postinst
@@ -1,2 +1 @@
 systemctl daemon-reload
-echo "nohang package installed; now you can edit config and enable/start the service"