From 5b1f4828bd1c32909b24f643070bbcabf30692a9 Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Mon, 2 Nov 2020 18:32:32 +0100
Subject: [PATCH] Move under scripts dir, stop using pip

---
 Makefile                         | 13 +++++++++----
 list_services.sh                 |  7 -------
 requirements.txt                 |  1 -
 clone_all.py => scripts/clone.py |  0
 scripts/services.sh              |  7 +++++++
 5 files changed, 16 insertions(+), 12 deletions(-)
 delete mode 100755 list_services.sh
 delete mode 100644 requirements.txt
 rename clone_all.py => scripts/clone.py (100%)
 mode change 100644 => 100755
 create mode 100755 scripts/services.sh

diff --git a/Makefile b/Makefile
index 5e92fff..e92ce22 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,12 @@
 default: install
-.PHONY: install
+
+.PHONY: install clone list-services
 
 install:
-	@python3 -m venv .venv && \
-	.venv/bin/pip install -U pip setuptools wheel && \
-	.venv/bin/pip install -r requirements.txt;
+	@apt install -y python3-requests
+
+clone:
+	@python3 scripts/clone.py
+
+list-services:
+	@bash scripts/services.sh
diff --git a/list_services.sh b/list_services.sh
deleted file mode 100755
index cf5b565..0000000
--- a/list_services.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-for f in clones/*/compose.yml;
-  do echo "${f}" && \
-    yq read --printMode p "$f" 'services.*' && \
-    echo;
-  done
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index f229360..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-requests
diff --git a/clone_all.py b/scripts/clone.py
old mode 100644
new mode 100755
similarity index 100%
rename from clone_all.py
rename to scripts/clone.py
diff --git a/scripts/services.sh b/scripts/services.sh
new file mode 100755
index 0000000..84091f7
--- /dev/null
+++ b/scripts/services.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+ABRA_DIR="$HOME/.abra/apps"
+
+for f in "$(find $ABRA_DIR -iname "compose*.yml")"; do
+  echo "$f" && yq read --printMode p "$f" 'services.*' && echo;
+done