[gnome-builder/gnome-builder-41] pipeline: improve path detection with append-path/prepend-path

[Christian Hergert <chergert src gnome org>]

commit 403074738f7455f20b3bdaf4060694f9da0a1ffc
Author: Christian Hergert <chergert redhat com>
Date:   Tue Dec 7 15:24:47 2021 -0800

    pipeline: improve path detection with append-path/prepend-path
    
    If these are set we might need to look at some alternate directories which
    are not in the PATH of the runtime itself.
    
    Related #1168 #1576

 src/libide/foundry/ide-pipeline.c | 43 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 2 deletions(-)
---
diff --git a/src/libide/foundry/ide-pipeline.c b/src/libide/foundry/ide-pipeline.c
index f5ce70cc4..f2504f5d3 100644
--- a/src/libide/foundry/ide-pipeline.c
+++ b/src/libide/foundry/ide-pipeline.c
@@ -4243,6 +4243,32 @@ ide_pipeline_get_arch (IdePipeline *self)
   return NULL;
 }
 
+static gboolean
+contains_in_runtime_with_alt_path (IdeRuntime *runtime,
+                                   const char *name,
+                                   const char *path)
+{
+  g_auto(GStrv) pathsplit = NULL;
+
+  g_assert (IDE_IS_RUNTIME (runtime));
+  g_assert (name != NULL);
+
+  if (path == NULL)
+    return FALSE;
+
+  pathsplit = g_strsplit (path, ":", 0);
+
+  for (guint i = 0; pathsplit[i]; i++)
+    {
+      g_autofree char *filename = g_build_filename (pathsplit[i], name, NULL);
+
+      if (ide_runtime_contains_program_in_path (runtime, filename, NULL))
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
 /**
  * ide_pipeline_contains_program_in_path:
  * @self: a #IdePipeline
@@ -4260,13 +4286,24 @@ ide_pipeline_contains_program_in_path (IdePipeline  *self,
                                        const gchar  *name,
                                        GCancellable *cancellable)
 {
+  const char *append_path = NULL;
+  const char *prepend_path = NULL;
+
   g_return_val_if_fail (IDE_IS_PIPELINE (self), FALSE);
   g_return_val_if_fail (name != NULL, FALSE);
   g_return_val_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable), FALSE);
 
+  if (self->config != NULL)
+    {
+      append_path = ide_config_get_append_path (self->config);
+      prepend_path = ide_config_get_prepend_path (self->config);
+    }
+
   if (self->runtime != NULL)
     {
-      if (ide_runtime_contains_program_in_path (self->runtime, name, cancellable))
+      if (ide_runtime_contains_program_in_path (self->runtime, name, cancellable) ||
+          contains_in_runtime_with_alt_path (self->runtime, name, prepend_path) ||
+          contains_in_runtime_with_alt_path (self->runtime, name, append_path))
         return TRUE;
     }
 
@@ -4286,7 +4323,9 @@ ide_pipeline_contains_program_in_path (IdePipeline  *self,
 
           g_assert (IDE_IS_RUNTIME (runtime));
 
-          if (ide_runtime_contains_program_in_path (runtime, name, cancellable))
+          if (ide_runtime_contains_program_in_path (runtime, name, cancellable) ||
+              contains_in_runtime_with_alt_path (runtime, name, prepend_path) ||
+              contains_in_runtime_with_alt_path (runtime, name, append_path))
             return TRUE;
         }
     }