marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

flatpak-info: Add runtime path

tingping/wmclass
Alexander Larsson 2016-09-07 12:19:13 +02:00
parent 32c571ae79
commit 0fc06022c8
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/flatpak-builtins-build.c
View File

@ -192,6 +192,7 @@ flatpak_builtin_build (int argc, char **argv, GCancellable *cancellable, GError
if (!flatpak_run_add_app_info_args (argv_array,
NULL,
app_files,
runtime_files,
app_id,
runtime_ref,
app_context,

13
common/flatpak-run.c
View File

@ -2544,6 +2544,7 @@ gboolean
flatpak_run_add_app_info_args (GPtrArray *argv_array,
GArray *fd_array,
GFile *app_files,
GFile *runtime_files,
const char *app_id,
const char *runtime_ref,
FlatpakContext *final_app_context,
@ -2557,7 +2558,8 @@ flatpak_run_add_app_info_args (GPtrArray *argv_array,
{
g_autoptr(GKeyFile) keyfile = NULL;
g_autoptr(GFile) files = NULL;
g_autofree char *files_path = NULL;
g_autofree char *app_path = NULL;
g_autofree char *runtime_path = NULL;
g_autofree char *fd_str = NULL;
g_autofree char *old_dest = g_strdup_printf ("/run/user/%d/flatpak-info", getuid ());
@ -2568,9 +2570,12 @@ flatpak_run_add_app_info_args (GPtrArray *argv_array,
g_key_file_set_string (keyfile, "Application", "name", app_id);
g_key_file_set_string (keyfile, "Application", "runtime", runtime_ref);
files_path = g_file_get_path (app_files);
app_path = g_file_get_path (app_files);
g_key_file_set_string (keyfile, "Application", "app-path", app_path);
runtime_path = g_file_get_path (runtime_files);
g_key_file_set_string (keyfile, "Application", "runtime-path", runtime_path);
g_key_file_set_string (keyfile, "Application", "app-path", files_path);
flatpak_context_save_metadata (final_app_context, keyfile);
@ -3330,7 +3335,7 @@ flatpak_run_app (const char *app_ref,
if (!flatpak_run_setup_base_argv (argv_array, fd_array, runtime_files, app_id_dir, app_ref_parts[2], flags, error))
return FALSE;
if (!flatpak_run_add_app_info_args (argv_array, fd_array, app_files, app_ref_parts[1], runtime_ref, app_context, error))
if (!flatpak_run_add_app_info_args (argv_array, fd_array, app_files, runtime_files, app_ref_parts[1], runtime_ref, app_context, error))
return FALSE;
if (!flatpak_run_add_extension_args (argv_array, metakey, app_ref, cancellable, error))

1
common/flatpak-run.h
View File

@ -112,6 +112,7 @@ gboolean flatpak_run_setup_base_argv (GPtrArray *argv_array,
gboolean flatpak_run_add_app_info_args (GPtrArray *argv_array,
GArray *fd_array,
GFile *app_files,
GFile *runtime_files,
const char *app_id,
const char *runtime_ref,
FlatpakContext *final_app_context,