pyrox.dev
1--- a/src/builder-context.c
2+++ b/src/builder-context.c
3@@ -763,7 +763,7 @@
4 g_autoptr(GFile) rofiles_base = NULL;
5 g_autoptr(GFile) rofiles_dir = NULL;
6 g_autofree char *tmpdir_name = NULL;
7- char *argv[] = { "rofiles-fuse",
8+ char *argv[] = { "@rofilesfuse@",
9 "-o",
10 "kernel_cache,entry_timeout=60,attr_timeout=60,splice_write,splice_move",
11 (char *)flatpak_file_get_path_cached (self->app_dir),
12--- a/src/builder-git.c
13+++ b/src/builder-git.c
14@@ -44,7 +44,7 @@
15 va_list ap;
16
17 va_start (ap, error);
18- res = flatpak_spawn (dir, output, flags, error, "git", ap);
19+ res = flatpak_spawn (dir, output, flags, error, "@git@", ap);
20 va_end (ap);
21
22 return res;
23@@ -58,7 +58,7 @@
24 va_list ap;
25
26 va_start (ap, error);
27- res = flatpak_spawn (NULL, NULL, 0, error, "cp", ap);
28+ res = flatpak_spawn (NULL, NULL, 0, error, "@cp@", ap);
29 va_end (ap);
30
31 return res;
32--- a/src/builder-source-archive.c
33+++ b/src/builder-source-archive.c
34@@ -430,7 +430,7 @@
35 va_list ap;
36
37 va_start (ap, error);
38- res = flatpak_spawn (dir, NULL, 0, error, "tar", ap);
39+ res = flatpak_spawn (dir, NULL, 0, error, "@tar@", ap);
40 va_end (ap);
41
42 return res;
43@@ -445,7 +445,7 @@
44 va_list ap;
45
46 va_start (ap, error);
47- res = flatpak_spawn (dir, NULL, 0, error, "unzip", ap);
48+ res = flatpak_spawn (dir, NULL, 0, error, "@unzip@", ap);
49 va_end (ap);
50
51 return res;
52@@ -457,7 +457,7 @@
53 GError **error)
54 {
55 gboolean res;
56- const gchar *argv[] = { "sh", "-c", "rpm2cpio \"$1\" | cpio -i -d",
57+ const gchar *argv[] = { "sh", "-c", "@rpm2cpio@ \"$1\" | @cpio@ -i -d",
58 "sh", /* shell's $0 */
59 rpm_path, /* shell's $1 */
60 NULL };
61@@ -604,7 +604,7 @@
62 va_list ap;
63
64 va_start (ap, error);
65- res = flatpak_spawn (dir, NULL, 0, error, "git", ap);
66+ res = flatpak_spawn (dir, NULL, 0, error, "@git@", ap);
67 va_end (ap);
68
69 return res;
70--- a/src/builder-source-bzr.c
71+++ b/src/builder-source-bzr.c
72@@ -124,7 +124,7 @@
73 va_list ap;
74
75 va_start (ap, error);
76- res = flatpak_spawn (dir, output, 0, error, "bzr", ap);
77+ res = flatpak_spawn (dir, output, 0, error, "@bzr@", ap);
78 va_end (ap);
79
80 return res;
81--- a/src/builder-source-patch.c
82+++ b/src/builder-source-patch.c
83@@ -215,15 +215,15 @@
84
85 args = g_ptr_array_new ();
86 if (use_git) {
87- g_ptr_array_add (args, "git");
88+ g_ptr_array_add (args, "@git@");
89 g_ptr_array_add (args, "apply");
90 g_ptr_array_add (args, "-v");
91 } else if (use_git_am) {
92- g_ptr_array_add (args, "git");
93+ g_ptr_array_add (args, "@git@");
94 g_ptr_array_add (args, "am");
95 g_ptr_array_add (args, "--keep-cr");
96 } else {
97- g_ptr_array_add (args, "patch");
98+ g_ptr_array_add (args, "@patch@");
99 }
100 for (i = 0; extra_options != NULL && extra_options[i] != NULL; i++)
101 g_ptr_array_add (args, (gchar *) extra_options[i]);
102--- a/src/builder-utils.c
103+++ b/src/builder-utils.c
104@@ -149,7 +149,7 @@
105 va_list ap;
106
107 va_start (ap, error);
108- res = flatpak_spawn (NULL, NULL, 0, error, "strip", ap);
109+ res = flatpak_spawn (NULL, NULL, 0, error, "@strip@", ap);
110 va_end (ap);
111
112 return res;
113@@ -163,7 +163,7 @@
114 va_list ap;
115
116 va_start (ap, error);
117- res = flatpak_spawn (NULL, NULL, 0, error, "eu-strip", ap);
118+ res = flatpak_spawn (NULL, NULL, 0, error, "@eustrip@", ap);
119 va_end (ap);
120
121 return res;
122@@ -177,7 +177,7 @@
123 va_list ap;
124
125 va_start (ap, error);
126- res = flatpak_spawn (NULL, NULL, 0, error, "eu-elfcompress", ap);
127+ res = flatpak_spawn (NULL, NULL, 0, error, "@euelfcompress@", ap);
128 va_end (ap);
129
130 return res;