Don't disable the daemon on upgrade

3 files changed, 10 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 831658d95857..cca7a4c7a770 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ckb-next
 	pkgdesc = Corsair Keyboard and Mouse Input Driver, release version
 	pkgver = 0.4.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/ckb-next/ckb-next
 	install = ckb-next.install
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 66970c9921ed..44338ae0d3b7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Light2Yellow <oleksii.vilchanskyi@gmail.com>
 pkgname=ckb-next
 pkgver=0.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Corsair Keyboard and Mouse Input Driver, release version"
 arch=('i686' 'x86_64')
 url="https://github.com/ckb-next/ckb-next"
diff --git a/ckb-next.install b/ckb-next.install
index 31a836c80b4d..03029634c973 100755
--- a/ckb-next.install
+++ b/ckb-next.install
@@ -23,6 +23,13 @@ You might want to run ckb-next-daemon as a systemd service:
 EOF
 }
 
+_disable_daemon() {
+    running="$(systemctl is-enabled ckb-next-daemon.service)"
+    if [[ "$running" = "enabled" ]]; then
+        systemctl disable ckb-next-daemon.service
+    fi
+}
+
 _terminate_gui_daemon() {
     msg_blue "Terminating ckb-next GUI"
 
@@ -46,11 +53,6 @@ _terminate_gui_daemon() {
     if [[ "$running" = "enabled" ]]; then
         systemctl disable ckb-daemon.service
     fi
-
-    running="$(systemctl is-enabled ckb-next-daemon.service)"
-    if [[ "$running" = "enabled" ]]; then
-        systemctl disable ckb-next-daemon.service
-    fi
 }
 
 # arg 1:  the new package version
@@ -68,12 +70,12 @@ pre_upgrade() {
 # arg 2:  the old package version
 post_upgrade() {
     systemctl daemon-reload
-    _as_service
 }
 
 # arg 1:  the old package version
 pre_remove() {
     _terminate_gui_daemon
+    _disable_daemon
 }
 
 # arg 1:  the old package version