diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | notes.install | 40 | ||||
| -rw-r--r-- | opentabletdriver.service | 12 | ||||
| -rwxr-xr-x | otd | 2 |
5 files changed, 42 insertions, 28 deletions
@@ -1,6 +1,6 @@ pkgbase = opentabletdriver-git pkgdesc = A cross-platform open source tablet driver - pkgver = v0.4.2.r282.g4372321 + pkgver = v0.5.0.r59.g6780778 pkgrel = 2 url = https://github.com/InfinityGhost/OpenTabletDriver install = notes.install @@ -25,11 +25,11 @@ pkgbase = opentabletdriver-git source = notes.install sha256sums = SKIP sha256sums = SKIP - sha256sums = f0f36182cbd8345b3a693fa8e4bff47d9e3d984ff7b1bfeeb9165d4b886d2180 + sha256sums = 8a09d29e683aefcbf54e5fe891d5688f959d9399804f9c151f0e8f6e6a1ede1a sha256sums = 20aac1584a8e08b5a9add1d02ce38e60ddfede615227df6f25c7422217df82b0 - sha256sums = 58db10ddb47008521e1d55e3758f7b30b78b7365d4fe3d14cbe339be2704301c + sha256sums = 419797d8915c32602fac3ed653dccc0573cd8ad633bacd925d9a82809da5fe4a sha256sums = 4399359bf6107b612d10aaa06abb197db540b00a973cfec64c2b40d1fbbb2834 - sha256sums = 63be4effd52af93cafc1b8cfd9ec0becd08bfcc6a6cb333d9e6e3072beb88e13 + sha256sums = ab3e758e9553e48cca60e6dfbca9ad710907e3c083d285d865b77d6788f266ea pkgname = opentabletdriver-git @@ -4,7 +4,7 @@ pkgname=opentabletdriver-git _pkgname=OpenTabletDriver _lpkgname=opentabletdriver _spkgname=otd -pkgver=v0.4.2.r282.g4372321 +pkgver=v0.5.0.r59.g6780778 pkgrel=2 pkgdesc="A cross-platform open source tablet driver" arch=('x86_64') @@ -26,11 +26,11 @@ source=('git+https://github.com/InfinityGhost/OpenTabletDriver' sha256sums=('SKIP' 'SKIP' - 'f0f36182cbd8345b3a693fa8e4bff47d9e3d984ff7b1bfeeb9165d4b886d2180' + '8a09d29e683aefcbf54e5fe891d5688f959d9399804f9c151f0e8f6e6a1ede1a' '20aac1584a8e08b5a9add1d02ce38e60ddfede615227df6f25c7422217df82b0' - '58db10ddb47008521e1d55e3758f7b30b78b7365d4fe3d14cbe339be2704301c' + '419797d8915c32602fac3ed653dccc0573cd8ad633bacd925d9a82809da5fe4a' '4399359bf6107b612d10aaa06abb197db540b00a973cfec64c2b40d1fbbb2834' - '63be4effd52af93cafc1b8cfd9ec0becd08bfcc6a6cb333d9e6e3072beb88e13') + 'ab3e758e9553e48cca60e6dfbca9ad710907e3c083d285d865b77d6788f266ea') pkgver() { cd "$srcdir/$_pkgname" diff --git a/notes.install b/notes.install index e3964ca9d122..11c45bea26fa 100644 --- a/notes.install +++ b/notes.install @@ -22,7 +22,7 @@ msg_modules() { echo -e " ${GREEN}blacklist <module>${RESET}" echo "Where <module> is 'wacom' if you own a wacom tablet, and 'hid_uclogic' otherwise." echo "To unload the module immediately, run:" - echo -e " $ ${GREEN}sudo rmmod <module>${RESET}" + echo -e " # ${GREEN}rmmod <module>${RESET}" echo } @@ -32,6 +32,31 @@ msg_faq() { } +msg_upgrade_starting() { + if [ $(vercmp $1 'v0.4.2.r282.g4372321-2') -gt -1 ] + then + return 0 + fi + + echo "The method of starting the daemon has changed since your previous version of OpenTabletDriver." + msg_starting +} + +msg_upgrade_systemd() { + if [ $(vercmp $1 'v0.5.0.r59.g6780778-2') -gt -1 ] + then + return 0 + fi + + echo "OpenTabletDriver's systemd user service has been updated since your previous version" + echo "To make systemd aware of this and apply changes immediately, please run the following commands:" + echo -e "${GREEN}systemctl --user daemon-reload" + echo "systemctl --user reenable opentabletdriver.service" + echo -e "systemctl --user restart opentabletdriver.service${RESET}" + echo +} + + post_install() { echo echo -e "${BOLD}Welcome to OpenTabletDriver!${RESET}" @@ -44,15 +69,6 @@ post_install() { } post_upgrade() { - if [ $(vercmp $2 'v0.4.2.r282.g4372321-2') -gt -1 ] - then - return 0 - fi - - echo - echo -e "${BOLD}Welcome to OpenTabletDriver!${RESET}" - echo "There are changes in the packaging compared to your previous version." - echo - echo "The method of starting the daemon has changed." - msg_starting + msg_upgrade_starting $2 + msg_upgrade_systemd $2 } diff --git a/opentabletdriver.service b/opentabletdriver.service index 95dc3b116ac7..a31e87055d7a 100644 --- a/opentabletdriver.service +++ b/opentabletdriver.service @@ -1,14 +1,12 @@ [Unit] Description=OpenTabletDriver Daemon -After=graphical.target -PartOf=graphical.target -StartLimitIntervalSec=60 -StartLimitBurst=2 +StartLimitIntervalSec=300 +StartLimitBurst=5 [Service] ExecStart=/usr/bin/otd -Restart=always -RestartSec=10s +Restart=on-failure +RestartSec=8s [Install] -WantedBy=graphical.target +WantedBy=multi-user.target @@ -5,7 +5,7 @@ then if [[ ! -v DISPLAY ]] && [[ ! -v WAYLAND_DISPLAY ]] then echo "DISPLAY and/or WAYLAND_DISPLAY is not set" - exit 1 + exit 64 fi dotnet ./OpenTabletDriver.Daemon.dll -c ./Configurations else |