From 1d3e83b0b3d2cf229e78874b3ed842f9c107dde8 Mon Sep 17 00:00:00 2001 From: José Bollo Date: Fri, 17 Nov 2017 08:53:57 +0100 Subject: afm-unit.conf: Fix missing @ in service name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Regression introduced by commit: c7db705 Generate afm-unit.conf using m4 Change-Id: Ibeeaf14b697e79cb2a95154b50b2ac775f93d529 Signed-off-by: José Bollo --- conf/afm-unit.conf.in | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'conf/afm-unit.conf.in') diff --git a/conf/afm-unit.conf.in b/conf/afm-unit.conf.in index d0b60fa..07ee8a0 100644 --- a/conf/afm-unit.conf.in +++ b/conf/afm-unit.conf.in @@ -87,12 +87,7 @@ Description={{description}} X-AFM-description={{description}} X-AFM-name={{name.content}} X-AFM-shortname={{name.short}} -#*************** -# use X-AFM-id={{:id}}--{{:ver}}--{{:#target}} -# instead of: X-AFM-id={{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}} -# when home screen will use real ids -#************** X-AFM-version={{:version}} X-AFM-author={{author.content}} X-AFM-author-email={{author.email}} @@ -145,7 +140,7 @@ Environment=XDG_RUNTIME_DIR=/run/user/%i Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%i/bus Environment=LD_LIBRARY_PATH=$ORIGIN/lib %systemd-unit system -%systemd-unit service afm-{{#required-permission.urn:AGL:permission::public:hidden}}service{{/required-permission.urn:AGL:permission::public:hidden}}{{^required-permission.urn:AGL:permission::public:hidden}}appli{{/required-permission.urn:AGL:permission::public:hidden}}-{{:id}}--{{:ver}}--{{:#target}} +%systemd-unit service afm-{{#required-permission.urn:AGL:permission::public:hidden}}service{{/required-permission.urn:AGL:permission::public:hidden}}{{^required-permission.urn:AGL:permission::public:hidden}}appli{{/required-permission.urn:AGL:permission::public:hidden}}-{{:id}}--{{:ver}}--{{:#target}}@ SyslogIdentifier=afbd-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}} StandardInput=null StandardOutput=journal @@ -211,7 +206,7 @@ WantedBy=default.target SmackLabel=* ListenStream=%t/apis/ws/{{name}} FileDescriptorName={{name}} -Service=afm-{{#required-permission.urn:AGL:permission::public:hidden}}service{{/required-permission.urn:AGL:permission::public:hidden}}{{^required-permission.urn:AGL:permission::public:hidden}}appli{{/required-permission.urn:AGL:permission::public:hidden}}-{{:id}}--{{:ver}}--{{:#target}}%i.service +Service=afm-{{#required-permission.urn:AGL:permission::public:hidden}}service{{/required-permission.urn:AGL:permission::public:hidden}}{{^required-permission.urn:AGL:permission::public:hidden}}appli{{/required-permission.urn:AGL:permission::public:hidden}}-{{:id}}--{{:ver}}--{{:#target}}@%i.service %nl [Install] WantedBy=sockets.target -- cgit 1.2.3-korg