Improved activation/deactivation of appimaged user service.

3 files changed, 13 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 046c1d0fd0d0..137d5359cc0c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Jan 24 14:19:57 UTC 2017
+# Tue Jan 24 16:33:55 UTC 2017
 pkgbase = appimage-git
 	pkgdesc = Package desktop applications as AppImages that run on common Linux-based operating systems, such as RHEL, CentOS, Ubuntu, Fedora, debian and derivatives.
 	pkgver = r431.ce2d4d7
-	pkgrel = 1
+	pkgrel = 2
 	url = http://appimage.org
 	install = appimage-git.install
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 1d252cc8d946..2c84e3c4fa65 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=appimage-git
 _gitname=AppImageKit
 pkgdesc="Package desktop applications as AppImages that run on common Linux-based operating systems, such as RHEL, CentOS, Ubuntu, Fedora, debian and derivatives."
 pkgver=r431.ce2d4d7
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://appimage.org"
 license=('MIT')
diff --git a/appimage-git.install b/appimage-git.install
index f3000091a037..98e08998cf1c 100644
--- a/appimage-git.install
+++ b/appimage-git.install
@@ -3,8 +3,11 @@ post_install() {
     user_exists=$(id -u $username > /dev/null 2>&1; echo $?)
 
     if [ "$user_exists" != "1" ]; then
-        su - $username -c "mkdir -p /home/$username/.config/systemd/user/graphical.target.wants/"
-        su - $username -c "ln -s /usr/lib/systemd/user/appimaged.service /home/$username/.config/systemd/user/graphical.target.wants/appimaged.service"
+        user_id=`id --user $username`
+
+        su - $username -c "XDG_RUNTIME_DIR=/run/user/$user_id /usr/bin/systemctl --user daemon-reload > /dev/null 2>&1"
+        su - $username -c "XDG_RUNTIME_DIR=/run/user/$user_id /usr/bin/systemctl --user enable appimaged > /dev/null 2>&1"
+        su - $username -c "XDG_RUNTIME_DIR=/run/user/$user_id /usr/bin/systemctl --user start appimaged > /dev/null 2>&1"
     fi
   done
 }
@@ -14,8 +17,11 @@ pre_remove() {
     user_exists=$(id -u $username > /dev/null 2>&1; echo $?)
 
     if [ "$user_exists" != "1" ]; then
-        su - $username -c "rm /home/$username/.config/systemd/user/graphical.target.wants/appimaged.service"
-        su - $username -c "rmdir /home/$username/.config/systemd/user/graphical.target.wants > /dev/null 2>&1"
+        user_id=`id --user $username`
+
+        su - $username -c "XDG_RUNTIME_DIR=/run/user/$user_id /usr/bin/systemctl --user daemon-reload > /dev/null 2>&1"
+        su - $username -c "XDG_RUNTIME_DIR=/run/user/$user_id /usr/bin/systemctl --user stop appimaged > /dev/null 2>&1"
+        su - $username -c "XDG_RUNTIME_DIR=/run/user/$user_id /usr/bin/systemctl --user disable appimaged > /dev/null 2>&1"
     fi
   done
 }