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

Merge pull request #37 from matthiasclasen/command-check 

flatpak-builder: Ensure after build that the binary listed in "command" is installed
tingping/wmclass
Alexander Larsson 2016-06-02 08:58:30 +02:00
parent 71be0b2977 7794a70f50
commit 4805d49bdf
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
builder/builder-manifest.c
View File

@ -1624,6 +1624,19 @@ builder_manifest_finish (BuilderManifest *self,
return FALSE;
}
if (self->command)
{
g_autoptr(GFile) bin_dir = g_file_resolve_relative_path (app_dir, "files/bin");
g_autoptr(GFile) bin_command = g_file_get_child (bin_dir, self->command);
if (!g_file_query_exists (bin_command, NULL))
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Command '%s' not found", self->command);
return FALSE;
}
}
args = g_ptr_array_new_with_free_func (g_free);
g_ptr_array_add (args, g_strdup ("flatpak"));
g_ptr_array_add (args, g_strdup ("build-finish"));