mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-05-19 06:11:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

builder: Handle absolute paths in command

Browse Source 
Don't fail with "not found" in this case because we're checking
the absolute path on the host, not in the final sandbox.
This commit is contained in:
Alexander Larsson
2017-03-20 17:53:20 +01:00
parent d7f2bf000e
commit c7086364be
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
builder/builder-manifest.c
View File

@@ -2057,10 +2057,19 @@ builder_manifest_finish (BuilderManifest *self,
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);
g_autoptr(GFile) files_dir = g_file_resolve_relative_path (app_dir, "files");
g_autoptr(GFile) command_file = NULL;
if (!g_file_query_exists (bin_command, NULL))
if (!g_path_is_absolute (self->command))
{
g_autoptr(GFile) bin_dir = g_file_resolve_relative_path (files_dir, "bin");
command_file = g_file_get_child (bin_dir, self->command);
}
else if (g_str_has_prefix (self->command, "/app/"))
command_file = g_file_resolve_relative_path (files_dir, self->command + strlen ("/app/"));
if (command_file != NULL &&
!g_file_query_exists (command_file, NULL))
{
const char *help = "";