pyrox.dev
1diff --git a/src/builder-context.c b/src/builder-context.c
2index dde12790..3a379297 100644
3--- a/src/builder-context.c
4+++ b/src/builder-context.c
5@@ -256,7 +256,7 @@ builder_context_init (BuilderContext *self)
6 g_autofree char *path = NULL;
7
8 self->rofiles_file_lock = init;
9- path = g_find_program_in_path ("rofiles-fuse");
10+ path = g_find_program_in_path ("@rofilesfuse@");
11 self->have_rofiles = path != NULL;
12 }
13
14@@ -800,7 +800,7 @@ builder_context_enable_rofiles (BuilderContext *self,
15 g_autoptr(GFile) rofiles_base = NULL;
16 g_autoptr(GFile) rofiles_dir = NULL;
17 g_autofree char *tmpdir_name = NULL;
18- char *argv[] = { "rofiles-fuse",
19+ char *argv[] = { "@rofilesfuse@",
20 "-o",
21 "kernel_cache,entry_timeout=60,attr_timeout=60,splice_write,splice_move",
22 (char *)flatpak_file_get_path_cached (self->app_dir),
23diff --git a/src/builder-git.c b/src/builder-git.c
24index ef517adb..6ab095f0 100644
25--- a/src/builder-git.c
26+++ b/src/builder-git.c
27@@ -44,7 +44,7 @@ git (GFile *dir,
28 va_list ap;
29
30 va_start (ap, error);
31- res = flatpak_spawn (dir, output, flags, error, "git", ap);
32+ res = flatpak_spawn (dir, output, flags, error, "@git@", ap);
33 va_end (ap);
34
35 return res;
36@@ -58,7 +58,7 @@ cp (GError **error,
37 va_list ap;
38
39 va_start (ap, error);
40- res = flatpak_spawn (NULL, NULL, 0, error, "cp", ap);
41+ res = flatpak_spawn (NULL, NULL, 0, error, "@cp@", ap);
42 va_end (ap);
43
44 return res;
45diff --git a/src/builder-source-archive.c b/src/builder-source-archive.c
46index ed66d5b..9ca9486 100644
47--- a/src/builder-source-archive.c
48+++ b/src/builder-source-archive.c
49@@ -484,7 +484,7 @@ tar (GFile *dir,
50 va_list ap;
51
52 va_start (ap, error);
53- res = flatpak_spawn (dir, NULL, 0, error, "tar", ap);
54+ res = flatpak_spawn (dir, NULL, 0, error, "@tar@", ap);
55 va_end (ap);
56
57 return res;
58@@ -496,7 +496,7 @@ unzip (GFile *dir,
59 GError **error)
60 {
61 gboolean res;
62- const char *argv[] = { "unzip", "-q", zip_path, NULL };
63+ const char *argv[] = { "@unzip@", "-q", zip_path, NULL };
64
65 res = flatpak_spawnv (dir, NULL, 0, error, argv, NULL);
66
67@@ -522,7 +522,7 @@ unrpm (GFile *dir,
68 GError **error)
69 {
70 gboolean res;
71- const gchar *argv[] = { "sh", "-c", "rpm2cpio \"$1\" | cpio -i -d",
72+ const gchar *argv[] = { "sh", "-c", "@rpm2cpio@ \"$1\" | @cpio@ -i -d",
73 "sh", /* shell's $0 */
74 rpm_path, /* shell's $1 */
75 NULL };
76@@ -677,7 +677,7 @@ git (GFile *dir,
77 va_list ap;
78
79 va_start (ap, error);
80- res = flatpak_spawn (dir, NULL, 0, error, "git", ap);
81+ res = flatpak_spawn (dir, NULL, 0, error, "@git@", ap);
82 va_end (ap);
83
84 return res;
85diff --git a/src/builder-source-bzr.c b/src/builder-source-bzr.c
86index ceeec94a..8abe6f53 100644
87--- a/src/builder-source-bzr.c
88+++ b/src/builder-source-bzr.c
89@@ -124,7 +124,7 @@ bzr (GFile *dir,
90 gboolean res;
91 va_list ap;
92
93- brz = g_find_program_in_path ("brz");
94+ brz = g_find_program_in_path ("@brz@");
95
96 va_start (ap, error);
97 res = flatpak_spawn (dir, output, 0, error, brz ? brz : "bzr", ap);
98diff --git a/src/builder-source-patch.c b/src/builder-source-patch.c
99index 8721e1e4..d7f4d840 100644
100--- a/src/builder-source-patch.c
101+++ b/src/builder-source-patch.c
102@@ -247,15 +247,15 @@ patch (GFile *dir,
103
104 args = g_ptr_array_new ();
105 if (use_git) {
106- g_ptr_array_add (args, "git");
107+ g_ptr_array_add (args, "@git@");
108 g_ptr_array_add (args, "apply");
109 g_ptr_array_add (args, "-v");
110 } else if (use_git_am) {
111- g_ptr_array_add (args, "git");
112+ g_ptr_array_add (args, "@git@");
113 g_ptr_array_add (args, "am");
114 g_ptr_array_add (args, "--keep-cr");
115 } else {
116- g_ptr_array_add (args, "patch");
117+ g_ptr_array_add (args, "@patch@");
118 }
119 for (i = 0; extra_options != NULL && extra_options[i] != NULL; i++)
120 g_ptr_array_add (args, (gchar *) extra_options[i]);
121diff --git a/src/builder-utils.c b/src/builder-utils.c
122index f1c06db5..2e3347c5 100644
123--- a/src/builder-utils.c
124+++ b/src/builder-utils.c
125@@ -149,7 +149,7 @@ strip (GError **error,
126 va_list ap;
127
128 va_start (ap, error);
129- res = flatpak_spawn (NULL, NULL, 0, error, "strip", ap);
130+ res = flatpak_spawn (NULL, NULL, 0, error, "@strip@", ap);
131 va_end (ap);
132
133 return res;
134@@ -163,7 +163,7 @@ eu_strip (GError **error,
135 va_list ap;
136
137 va_start (ap, error);
138- res = flatpak_spawn (NULL, NULL, 0, error, "eu-strip", ap);
139+ res = flatpak_spawn (NULL, NULL, 0, error, "@eustrip@", ap);
140 va_end (ap);
141
142 return res;
143@@ -177,7 +177,7 @@ eu_elfcompress (GError **error,
144 va_list ap;
145
146 va_start (ap, error);
147- res = flatpak_spawn (NULL, NULL, 0, error, "eu-elfcompress", ap);
148+ res = flatpak_spawn (NULL, NULL, 0, error, "@euelfcompress@", ap);
149 va_end (ap);
150
151 return res;