Switch to a user service

3 files changed, 68 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b928d9d107ca..133ea5636f0c 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,19 @@
 pkgbase = g910-gkeys-git
 	pkgdesc = GKey support for Logitech G910 Keyboard on GNU/Linux
-	pkgver = 0.3.0
-	pkgrel = 2
+	pkgver = 0.4.0
+	pkgrel = 1
 	url = https://github.com/JSubelj/g910-gkey-macro-support
 	install = g910-gkeys-git.install
 	arch = any
 	license = GPL3
+	makedepends = git
+	makedepends = systemd
 	depends = python-pyusb
 	depends = python-uinput
-	backup = etc/g910-gkeys/config.json
-	backup = usr/lib/systemd/system/g910-gkeys.service
+	backup = {/home/jlaunay}/.config/g910-gkeys/config.json
+	backup = usr/lib/systemd/user/g910-gkeys.service
+	backup = etc/udev/rules.d/60-g910-gkeys.rules
+	backup = etc/modules-load.d/uinput-g910-gkeys.conf
 	source = git+https://github.com/JSubelj/g910-gkey-macro-support.git
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index f5f2d74506db..83a49ebec9f1 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,16 +3,17 @@
 pkgname=g910-gkeys-git
 _appname=g910-gkeys
 _gitname=g910-gkey-macro-support
-pkgver=0.3.0
-pkgrel=2
+pkgver=0.4.0
+pkgrel=1
 pkgdesc='GKey support for Logitech G910 Keyboard on GNU/Linux'
 url='https://github.com/JSubelj/g910-gkey-macro-support'
 arch=('any')
 license=('GPL3')
 depends=('python-pyusb' 'python-uinput')
 source=('git+https://github.com/JSubelj/g910-gkey-macro-support.git')
+makedepends=('git' 'systemd')
 install=${pkgname}.install
-backup=("etc/${_appname}/config.json" "usr/lib/systemd/system/g910-gkeys.service")
+backup=("{$HOME}/.config/g910-gkeys/config.json" "usr/lib/systemd/user/g910-gkeys.service" "etc/udev/rules.d/60-g910-gkeys.rules" "etc/modules-load.d/uinput-g910-gkeys.conf")
 md5sums=('SKIP')
 
 build() {
@@ -27,6 +28,8 @@ pkgver() {
 
 package() {
   cd ${srcdir}/${_gitname}
-  python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
-  install -Dm 644 -t $pkgdir/usr/lib/systemd/system ${srcdir}/${_gitname}/etc/g910-gkeys.service
+A  python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+  install -Dm 644 -t $pkgdir/usr/lib/systemd/user etc/g910-gkeys.service
+  install -Dm 644 -t $pkgdir/etc/udev/rules.d/60-g910-gkeys.rules etc/60-g910-gkeys.rules
+  install -Dm 644 -t $pkgdir/etc/modules-load.d/uinput-g910-gkeys.conf etc/uinput-g910-gkeys.conf
 }
diff --git a/g910-gkeys-git.install b/g910-gkeys-git.install
index 5ab48879a22d..c3ba2de57748 100755
--- a/g910-gkeys-git.install
+++ b/g910-gkeys-git.install
@@ -1,16 +1,28 @@
 post_install() {
+    # make config dir
+    if [[ ! -d "$HOME"/.config/g910-gkeys ]]; then
+        mkdir "$HOME"/.config/g910-gkeys
+    fi
+
+    # check for existing config file
+    if [[ ! -f "$HOME"/.config/g910-gkeys/config.json ]]; then
+        # if not copy default config to config dir
+        cp ./etc/config.json "$HOME"/.config/g910-gkeys/config.json
+    fi
+
+    # reload daemon
+    systemctl --user daemon-reload
+
+    # enable and start service if necessary
+    systemctl --user enable --now g910-gkeys.service
+
     echo ""
 	echo "#########################################################"
     echo ""
-	echo "You can now enable the service by:"
-    echo ""
-	echo "      # systemctl enable g910-gkeys.service"
-    echo ""
-	echo "And run it with:"
-    echo ""
-	echo "      # systemctl start g910-gkeys.service"
-    echo ""
-	echo "Log file is stored in /var/log/g910-gkeys.log"
+	echo "Service ${_appname} was enabled and started by default:"
+	echo ""
+    echo "Config is in ${HOME}/.config/g910-gkeys/config.json"
+	echo "Log file is stored in ${HOME}/g910-gkeys.log"
 	echo ""
 	echo "#########################################################"
 	echo ""
@@ -18,19 +30,42 @@ post_install() {
 
 
 post_upgrade() {
+    # make config dir
+    if [[ ! -d "$HOME"/.config/g910-gkeys ]]; then
+      mkdir "$HOME"/.config/g910-gkeys
+    fi
+
+    # check for existing config file
+    if [[ ! -f "$HOME"/.config/g910-gkeys/config.json ]]; then
+      if [[ -f /etc/g910-gkeys/config.json ]]; then
+        # if old config exist move it to new location (will need root privileges)
+        sudo mv /etc/g910-gkeys/config.json "$HOME"/.config/g910-gkeys/config.json
+        sudo chown "$USER":"$USER" "$HOME"/.config/g910-gkeys/config.json
+      else
+        # if not copy default config to config dir
+        cp ./etc/config.json "$HOME"/.config/g910-gkeys/config.json
+      fi
+    fi
+
+    # reload daemon
+    systemctl --user daemon-reload
+
+    # enable and start service if necessary
+    systemctl --user enable --now g910-gkeys.service
+
 	echo ""
 	echo "#########################################################"
     echo ""
-	echo "You can now enable the service by:"
-    echo ""
-	echo "      # systemctl enable g910-gkeys.service"
+	echo "Service ${_appname} was enabled and started by default:"
     echo ""
-	echo "And run it with:"
-    echo ""
-	echo "      # systemctl start g910-gkeys.service"
-    echo ""
-	echo "Log file is stored in /var/log/g910-gkeys.log"
+    echo "Config is in ${HOME}/.config/g910-gkeys/config.json"
+	echo "Log file is stored in ${HOME}/g910-gkeys.log"
 	echo ""
 	echo "#########################################################"
 	echo ""
 }
+
+pre_remove() {
+    # shutdown and disable service
+    systemctl --user disable --now g910-gkeys
+}