Fix notes.install post_upgrade logic

Aside from fixing the <0.6.0 detection logic, we now also ask the user to restart the daemon

3 files changed, 11 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 638c8bf554a4..cc508a703d98 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = opentabletdriver
 	pkgdesc = A cross-platform open source tablet driver
 	pkgver = 0.6.0.2
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/OpenTabletDriver/OpenTabletDriver
 	install = notes.install
 	arch = x86_64
@@ -25,6 +25,6 @@ pkgbase = opentabletdriver
 	sha256sums = 20aac1584a8e08b5a9add1d02ce38e60ddfede615227df6f25c7422217df82b0
 	sha256sums = 88f7d9ae1e9402cfbf9266ddf0de642195b64de13a3d5ce6f93460ba035cf7f2
 	sha256sums = 4399359bf6107b612d10aaa06abb197db540b00a973cfec64c2b40d1fbbb2834
-	sha256sums = b28aa1d2d4f531d877f6601eb5e684f78cee7acfe2bd7af739e5144fd36bafdf
+	sha256sums = c18e36c7287db4dc16df687693f7ffe548620b26c03b2a98b0b44f4fdedfd442
 
 pkgname = opentabletdriver
diff --git a/PKGBUILD b/PKGBUILD
index 3c062fc29dbf..6ee2eec7c027 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ _pkgname=OpenTabletDriver
 _lpkgname=opentabletdriver
 _spkgname=otd
 pkgver=0.6.0.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A cross-platform open source tablet driver"
 arch=('x86_64')
 url="https://github.com/OpenTabletDriver/OpenTabletDriver"
@@ -27,7 +27,7 @@ sha256sums=('d148aac9dee2175261669b51cedd046f19efff6fbda5573ca1f0e2a636d2d4d9'
             '20aac1584a8e08b5a9add1d02ce38e60ddfede615227df6f25c7422217df82b0'
             '88f7d9ae1e9402cfbf9266ddf0de642195b64de13a3d5ce6f93460ba035cf7f2'
             '4399359bf6107b612d10aaa06abb197db540b00a973cfec64c2b40d1fbbb2834'
-            'b28aa1d2d4f531d877f6601eb5e684f78cee7acfe2bd7af739e5144fd36bafdf')
+            'c18e36c7287db4dc16df687693f7ffe548620b26c03b2a98b0b44f4fdedfd442')
 
 _srcdir="OpenTabletDriver-$pkgver"
 
diff --git a/notes.install b/notes.install
index 44e6d45b7b04..9254262f4e6f 100644
--- a/notes.install
+++ b/notes.install
@@ -43,11 +43,12 @@ post_install() {
 }
 
 post_upgrade() {
-  if [ $(vercmp $2 'v0.6.0-1') -lt 0 ]; then
-    return 0
-  fi
-  echo -e "${BOLD}The plugin API and tablet configuration format has changed in OpenTabletDriver 0.6${RESET}"
-  echo -e "You may want to clear the contents of the ${GREEN}Plugins/${RESET} and ${GREEN}Configurations/${RESET} folder in ${GREEN}~/.config/OpenTabletDriver/${RESET}"
-  echo "Mismatching GUI and daemon versions isn't supported, so make sure to restart the OpenTabletDriver daemon"
+  echo -e "${BOLD}Mismatching OpenTabletDriver versions between GUI and daemon isn't supported${RESET}"
+  echo -e "Restart your daemon with ${GREEN}systemctl --user restart opentabletdriver${RESET}"
   echo
+  if [ $(vercmp $2 0.6.0-1) -lt 0 ]; then
+    echo -e "${BOLD}The plugin API and tablet configuration format has changed in OpenTabletDriver 0.6${RESET}"
+    echo -e "You may want to clear the contents of the ${GREEN}Plugins/${RESET} and ${GREEN}Configurations/${RESET} folder in ${GREEN}~/.config/OpenTabletDriver/${RESET}"
+    echo
+  fi
 }