builder: Merge spawn helpers to single base helper

1 files changed, 4 insertions, 28 deletions

diff --git a/builder/builder-source-patch.c b/builder/builder-source-patch.c
index 6832acd..c701518 100644
--- a/builder/builder-source-patch.c
+++ b/builder/builder-source-patch.c
@@ -147,40 +147,16 @@ builder_source_patch_download (BuilderSource *source,
 static gboolean
 patch (GFile *dir,
        GError **error,
-       const gchar            *argv1,
      ...)
 {
-  g_autoptr(GSubprocessLauncher) launcher = NULL;
-  g_autoptr(GSubprocess) subp = NULL;
-  GPtrArray *args;
-  const gchar *arg;
+  gboolean res;
   va_list ap;
 
-  args = g_ptr_array_new ();
-  g_ptr_array_add (args, "patch");
-  va_start (ap, argv1);
-  g_ptr_array_add (args, (gchar *) argv1);
-  while ((arg = va_arg (ap, const gchar *)))
-    g_ptr_array_add (args, (gchar *) arg);
-  g_ptr_array_add (args, NULL);
+  va_start (ap, error);
+  res = xdg_app_spawn (dir, NULL, error, "git", ap);
   va_end (ap);
 
-  launcher = g_subprocess_launcher_new (0);
-
-  if (dir)
-    {
-      g_autofree char *path = g_file_get_path (dir);
-      g_subprocess_launcher_set_cwd (launcher, path);
-    }
-
-  subp = g_subprocess_launcher_spawnv (launcher, (const gchar * const *) args->pdata, error);
-  g_ptr_array_free (args, TRUE);
-
-  if (subp == NULL ||
-      !g_subprocess_wait_check (subp, NULL, error))
-    return FALSE;
-
-  return TRUE;
+  return res;
 }
 
 static gboolean