Merge lp:~mterry/indicator-application/snap-root into lp:indicator-application/16.10

Proposed by Michael Terry
Status: Merged
Approved by: Charles Kerr
Approved revision: 255
Merged at revision: 259
Proposed branch: lp:~mterry/indicator-application/snap-root
Merge into: lp:indicator-application/16.10
Diff against target: 11 lines (+1/-1)
1 file modified
data/indicator-application.conf.in (+1/-1)
To merge this branch: bzr merge lp:~mterry/indicator-application/snap-root
Reviewer Review Type Date Requested Status
Indicator Applet Developers Pending
Review via email: mp+308174@code.launchpad.net

Commit message

Work inside a snap by prefixing hard coded paths with $SNAP.

Description of the change

I know this indicator only works in unity7 right now. But while I was fixing other indicators, figured I'd do this one too.

There are also two hardcoded paths in the data/*.desktop.in files. But that's a static desktop file, so $SNAP isn't appropriate.

I'm not sure what the best solution for those is, but presumably it would lie in whichever component consumes the desktop file, not this package.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/indicator-application.conf.in'
2--- data/indicator-application.conf.in 2014-04-07 13:27:30 +0000
3+++ data/indicator-application.conf.in 2016-10-11 18:33:29 +0000
4@@ -17,6 +17,6 @@
5 fi
6 end script
7
8-exec @pkglibexecdir@/indicator-application-service
9+exec $SNAP@pkglibexecdir@/indicator-application-service
10
11 pre-stop exec initctl emit appindicators-end

Subscribers

People subscribed via source and target branches