data: If we're using snap mode, configure frontend to use lsi-exec

This will ensure that the settings UI will always work, which will
somewhat perversely use lsi-exec through the config that it sets to
launch itself to set the config of lsi-exec..

This will allow us to actually expose lsi-settings as a usable thing
within the snap, where it is currently omitted. If we're not using snapd
mode, we'll just keep the file how it used to look.

Signed-off-by: Ikey Doherty <ikey@solus-project.com>
This commit is contained in:
Ikey Doherty
2017-11-15 00:15:05 +00:00
parent 16a0750ed2
commit 00ee48ee22
4 changed files with 24 additions and 5 deletions
@@ -1,7 +1,7 @@
[Desktop Entry]
Name=Linux Steam Integration
Comment=Application for managing Steam integration settings
Exec=lsi-settings
Exec=@LSI_SETTINGS@
Icon=steam
Terminal=false
Type=Application
+10 -2
View File
@@ -2,8 +2,16 @@ appsdir = join_paths(datadir, 'applications')
# If frontend is enabled, install lsi-settings.desktop
if with_frontend == true
install_data(
'lsi-settings.desktop',
data_conf = configuration_data()
if with_snap_support == true
data_conf.set('LSI_SETTINGS', 'linux-steam-integration.exec $SNAP/bin/linux-steam-integration.settings')
else
data_conf.set('LSI_SETTINGS', 'lsi-settings')
endif
configure_file(
input: 'lsi-settings.desktop.in',
output: 'lsi-settings.desktop',
configuration: data_conf,
install_dir: appsdir,
)
endif
+6 -1
View File
@@ -6,8 +6,13 @@ if with_frontend == true
'main-window.c',
]
frontend_name = 'lsi-settings'
if with_snap_support == true
frontend_name = 'linux-steam-integration.settings'
endif
frontend = executable(
'lsi-settings',
frontend_name,
sources: frontend_sources + nica_sources,
include_directories: nica_includes,
dependencies: [
+7 -1
View File
@@ -15,6 +15,12 @@ if shim_behaviour != 'none'
'lsi-exec.c',
]
exec_name = 'lsi-exec'
frontend_name = 'lsi-settings'
if with_snap_support == true
exec_name = 'linux-steam-integration.exec'
endif
shim = executable(
shim_target_name,
sources: shim_sources + nica_sources,
@@ -26,7 +32,7 @@ if shim_behaviour != 'none'
)
lsi_exec = executable(
'lsi-exec',
exec_name,
sources: exec_sources + nica_sources,
include_directories: nica_includes,
dependencies: [