mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-01-24 07:38:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Support the --installation parameter for the flatpak run command

Browse Source
This commit is contained in:
Mario Sanchez Prada
2016-12-16 19:17:40 +00:00
parent 7d6197e3aa
commit 4e68283f47
1 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
app/flatpak-builtins-run.c
View File

@@ -111,11 +111,24 @@ flatpak_builtin_run (int argc, char **argv, GCancellable *cancellable, GError **
{
g_autofree char *current_ref = NULL;
g_autoptr(FlatpakDir) user_dir = flatpak_dir_get_user ();
g_autoptr(FlatpakDir) system_dir = flatpak_dir_get_system_default ();
current_ref = flatpak_dir_current_ref (user_dir, id, cancellable);
if (current_ref == NULL)
current_ref = flatpak_dir_current_ref (system_dir, id, cancellable);
{
g_autoptr(GPtrArray) system_dirs = NULL;
system_dirs = flatpak_dir_get_system_list (cancellable, error);
if (system_dirs == NULL)
return FALSE;
for (i = 0; i < system_dirs->len; i++)
{
FlatpakDir *dir = g_ptr_array_index (system_dirs, i);
current_ref = flatpak_dir_current_ref (dir, id, cancellable);
if (current_ref != NULL)
break;
}
}
if (current_ref)
{
@@ -192,9 +205,9 @@ flatpak_complete_run (FlatpakCompletion *completion)
{
g_autoptr(GOptionContext) context = NULL;
g_autoptr(FlatpakDir) user_dir = NULL;
g_autoptr(FlatpakDir) system_dir = NULL;
g_autoptr(GPtrArray) system_dirs = NULL;
g_autoptr(GError) error = NULL;
int i;
int i, j;
g_autoptr(FlatpakContext) arg_context = NULL;
context = g_option_context_new ("");
@@ -228,20 +241,27 @@ flatpak_complete_run (FlatpakCompletion *completion)
}
}
system_dir = flatpak_dir_get_system_default ();
{
g_auto(GStrv) refs = flatpak_dir_find_installed_refs (system_dir, NULL, NULL, opt_arch,
FLATPAK_KINDS_APP, &error);
if (refs == NULL)
flatpak_completion_debug ("find local refs error: %s", error->message);
for (i = 0; refs != NULL && refs[i] != NULL; i++)
{
g_auto(GStrv) parts = flatpak_decompose_ref (refs[i], NULL);
if (parts)
flatpak_complete_word (completion, "%s ", parts[1]);
}
system_dirs = flatpak_dir_get_system_list (NULL, &error);
if (system_dirs == NULL) {
flatpak_completion_debug ("find system installations error: %s", error->message);
break;
}
for (i = 0; i < system_dirs->len; i++)
{
FlatpakDir *dir = g_ptr_array_index (system_dirs, i);
g_auto(GStrv) refs = flatpak_dir_find_installed_refs (dir, NULL, NULL, opt_arch,
FLATPAK_KINDS_APP, &error);
if (refs == NULL)
flatpak_completion_debug ("find local refs error: %s", error->message);
for (j = 0; refs != NULL && refs[j] != NULL; j++)
{
g_auto(GStrv) parts = flatpak_decompose_ref (refs[j], NULL);
if (parts)
flatpak_complete_word (completion, "%s ", parts[1]);
}
}
break;
}