From 20c0700f7012c50d2ff74a0d21a97b45bb175ea6 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 3 May 2023 07:16:55 -0400 Subject: [PATCH] Actually run the exported command in the wrapper This was an oversight from copying the original wrapper setup code. Co-authored-by: Robert McQueen --- common/flatpak-dir.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c index 99000968..98af4647 100644 --- a/common/flatpak-dir.c +++ b/common/flatpak-dir.c @@ -8966,17 +8966,18 @@ flatpak_dir_deploy (FlatpakDir *self, for (unsigned int i = 0; commands && commands[i]; i++) { g_autofree char *filename = NULL; + g_autofree char *escaped_cmd = NULL; + GError *local_error = NULL; g_set_object (&wrapper, NULL); - g_clear_pointer (&escaped_app, g_free); g_clear_pointer (&bin_data, g_free); filename = g_strconcat (ref_id, "-", commands[i], NULL); wrapper = g_file_get_child (bindir, filename); - escaped_app = maybe_quote (commands[i]); + escaped_cmd = maybe_quote (commands[i]); - bin_data = g_strdup_printf ("#!/bin/sh\nexec %s run --branch=%s --arch=%s %s \"$@\"\n", - flatpak, escaped_branch, escaped_arch, escaped_app); + bin_data = g_strdup_printf ("#!/bin/sh\nexec %s run --branch=%s --arch=%s --command=%s %s \"$@\"\n", + flatpak, escaped_branch, escaped_arch, escaped_cmd, escaped_app); if (!g_file_replace_contents (wrapper, bin_data, strlen (bin_data), NULL, FALSE, G_FILE_CREATE_REPLACE_DESTINATION, NULL, cancellable, error))