From 0206279894239d590e6f9d294ec2d3d7c97d9989 Mon Sep 17 00:00:00 2001
From: 3wc <3wc.git@doesthisthing.work>
Date: Sat, 3 Apr 2021 15:44:13 +0200
Subject: [PATCH] Use abra's vendored copy of yq instead of system

---
 bin/app-json.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/app-json.py b/bin/app-json.py
index fd81b3d..b9cbbf9 100755
--- a/bin/app-json.py
+++ b/bin/app-json.py
@@ -20,6 +20,7 @@ from requests import get
 
 HOME_PATH = expanduser("~/")
 CLONES_PATH = Path(f"{HOME_PATH}/.abra/apps").absolute()
+YQ_PATH = Path(f"{HOME_PATH}/.abra/vendor/yq")
 SCRIPT_PATH = Path(__file__).absolute().parent
 REPOS_TO_SKIP = (
     "abra",
@@ -179,7 +180,7 @@ def get_app_versions(app_path, cached_apps_json):
     for tag in tags:
         _run_cmd(f"git checkout {tag}")
 
-        services_cmd = "yq e '.services | keys | .[]' compose*.yml"
+        services_cmd = f"{YQ_PATH} e '.services | keys | .[]' compose*.yml"
         services = _run_cmd(services_cmd, shell=True).split()
 
         parsed_services = []
@@ -199,7 +200,7 @@ def get_app_versions(app_path, cached_apps_json):
                 log.info(f"Skipped {service} asa we've already parsed it locally")
                 continue
 
-            services_cmd = f"yq e '.services.{service}.image' compose*.yml"
+            services_cmd = f"{YQ_PATH} e '.services.{service}.image' compose*.yml"
             images = _run_cmd(services_cmd, shell=True).split()
 
             for image in images: