Merge pull request #9 from evkarpov/master

[qmf] Updated service startup
sailfishos · Oct 25, 2013 · dc94d86 · dc94d86
2 parents 337a0bb + 4a6b795
commit dc94d86
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 11 deletions.
diff --git a/qmf/src/tools/accountscheck/accountscheck.pro b/qmf/src/tools/accountscheck/accountscheck.pro
@@ -16,8 +16,4 @@ SOURCES += accountscheck.cpp
 systemd.files = ../systemd/messageserver5.service
 systemd.path= /usr/lib/systemd/user/
 
-# Target to install script file
-script.files = ../systemd/messageserver5.sh
-script.path = /usr/bin
-
-INSTALLS+= target systemd script
+INSTALLS+= target systemd
diff --git a/qmf/src/tools/systemd/messageserver5.service b/qmf/src/tools/systemd/messageserver5.service
@@ -6,8 +6,8 @@ After=booster-generic.service
 [Service]
 Type=simple
 ExecStartPre=/usr/bin/qmf-accountscheck
-ExecStart=/usr/bin/messageserver5.sh
-Restart=always
+ExecStart=/usr/bin/invoker --type=generic --global-syms /usr/bin/messageserver5
+Restart=on-failure
 RestartSec=1
 
 [Install]

diff --git a/qmf/src/tools/systemd/messageserver5.sh b/qmf/src/tools/systemd/messageserver5.sh
diff --git a/rpm/qmf-qt5.spec b/rpm/qmf-qt5.spec
@@ -218,7 +218,6 @@ ln -sf ../messageserver5.service "$UNIT_DIR/messageserver5.service"
 # >> files libqmfmessageserver1-qt5
 %{_bindir}/messageserver5
 %{_bindir}/qmf-accountscheck
-%{_bindir}/messageserver5.sh
 %{_libdir}/libqmfmessageserver5.so.*
 %{_libdir}/qmf/plugins5/messageservices/libimap.so
 %{_libdir}/qmf/plugins5/messageservices/libpop.so