diff options
| author | Robert Tari <robert@tari.in> | 2020-08-11 08:58:52 +0200 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2020-08-11 08:58:52 +0200 |
| commit | 3fc4dab5c4407697115fb14f6f23444de1206544 (patch) | |
| tree | cde5d3c938510950c54981db42c45367cbb83b5f /data | |
| parent | 474e1d6f82bd95afa4c427c3354e3970bae594f5 (diff) | |
| parent | da02fa1cbc2443628289661b48dc0f635532acf1 (diff) | |
| download | ayatana-indicator-messages-3fc4dab5c4407697115fb14f6f23444de1206544.tar.gz ayatana-indicator-messages-3fc4dab5c4407697115fb14f6f23444de1206544.tar.bz2 ayatana-indicator-messages-3fc4dab5c4407697115fb14f6f23444de1206544.zip | |
Merge branch 'sunweaver-pr/systemd-service-file'
Attributes GH PR #11: https://github.com/AyatanaIndicators/ayatana-indicator-messages/pull/11
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 23 | ||||
| -rw-r--r-- | data/ayatana-indicator-messages.conf.in | 9 | ||||
| -rw-r--r-- | data/ayatana-indicator-messages.service.in | 11 |
3 files changed, 26 insertions, 17 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 60dd839..b88aee5 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,3 +1,5 @@ +NULL = + SUBDIRS = icons xdg_autostartdir = /etc/xdg/autostart @@ -6,23 +8,28 @@ xdg_autostart_DATA = ayatana-indicator-messages.desktop %.desktop: %.desktop.in $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ -upstart_jobsdir = $(datadir)/upstart/sessions/ -upstart_jobs_DATA = ayatana-indicator-messages.conf +gsettings_SCHEMAS = org.ayatana.indicator.messages.gschema.xml +@GSETTINGS_RULES@ -%.conf: %.conf.in +#if defined(HAVE_SYSTEMD) +systemdservice_file = ayatana-indicator-messages.service +$(systemdservice_file): $(systemdservice_file).in $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ -gsettings_SCHEMAS = org.ayatana.indicator.messages.gschema.xml -@GSETTINGS_RULES@ +systemddir = $(SYSTEMD_USERDIR) +systemd_DATA = $(systemdservice_file) +#endif indicatordir = $(INDICATOR_DIR) dist_indicator_DATA = org.ayatana.indicator.messages EXTRA_DIST = \ ayatana-indicator-messages.desktop.in \ - ayatana-indicator-messages.conf.in \ - $(gsettings_SCHEMAS) + $(gsettings_SCHEMAS) \ + $(systemdservice_file).in \ + $(NULL) CLEANFILES = \ $(xdg_autostart_DATA) \ - $(upstart_jobs_DATA) + $(systemdservice_file) \ + $(NULL) diff --git a/data/ayatana-indicator-messages.conf.in b/data/ayatana-indicator-messages.conf.in deleted file mode 100644 index ed7a4b6..0000000 --- a/data/ayatana-indicator-messages.conf.in +++ /dev/null @@ -1,9 +0,0 @@ -description "Ayatana Indicator Messages Service" - -start on ayatana-indicator-services-start -stop on desktop-end or ayatana-indicator-services-end - -respawn -respawn limit 2 10 - -exec $SNAP@pkglibexecdir@/ayatana-indicator-messages-service diff --git a/data/ayatana-indicator-messages.service.in b/data/ayatana-indicator-messages.service.in new file mode 100644 index 0000000..a0a3ba0 --- /dev/null +++ b/data/ayatana-indicator-messages.service.in @@ -0,0 +1,11 @@ +[Unit] +Description=Ayatana Indicator Messages Service +PartOf=graphical-session.target +PartOf=ayatana-indicators.target + +[Service] +ExecStart=@pkglibexecdir@/ayatana-indicator-messages-service +Restart=on-failure + +[Install] +WantedBy=ayatana-indicators.target |