From 6485af441127fec85855c65ee48b73c3a27f60d7 Mon Sep 17 00:00:00 2001
From: bretello <bretello@distruzione.org>
Date: Tue, 8 Dec 2020 18:17:20 +0100
Subject: [PATCH] dev: improve makefile log readability

---
 dev/Makefile | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/dev/Makefile b/dev/Makefile
index 7378517..89fd01a 100644
--- a/dev/Makefile
+++ b/dev/Makefile
@@ -1,5 +1,18 @@
 SHELL=/bin/bash
 
+ifndef VERBOSE
+.SILENT:
+endif
+
+CLEAR="\033[0m"
+BOLD="\033[1m"
+GREEN="\033[32m"
+RED="\033[31m"
+BLUE="\033[34m"
+WHITE="\033[37m"
+
+.PHONY: test_colors clean list_targets build arch archlinux run
+
 all: list_targets
 
 list_targets:
@@ -9,17 +22,22 @@ list_targets:
 debian: clean build-debian run
 arch archlinux: clean build-arch run
 
-build-debian:
+build: build-arch
+
+build-debian: Dockerfile.debian
 	docker build -t brethil/dotfiles:dev -f Dockerfile.debian .
 
-build-arch:
+build-arch: Dockerfile.archlinux
 	docker build -t brethil/dotfiles:dev -f Dockerfile.archlinux .
 
-run:
-	docker run -d --name=dotfiles-dev brethil/dotfiles:dev
-	echo "*** Started container, listening on ${BOLD}${WHITE}`docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' dotfiles-dev`:22${CLEAR}"
+run: build clean
+	docker run -d --name=dotfiles-dev -v ${PWD}/..:/root/.dotfiles brethil/dotfiles:dev
+	echo -en ${GREEN} "***" ${CLEAR} Started container, listening on ${BOLD}${WHITE}
+	echo -e ${msg} `docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' dotfiles-dev`:22 ${CLEAR}
+	echo -e ${GREEN} "***" ${CLEAR} Watching logs from the container. Hit Ctrl+C to stop watching. Run \`make clean\` to stop and remove the container
 	docker logs -f dotfiles-dev
 
 clean:
-	docker stop dotfiles-dev || echo "no containers to stop"
-	docker rm dotfiles-dev || echo "no containers to remove"
+	echo -e ${GREEN} "***" ${CLEAR} Stopping and removing \"dockerfiles-dev\" container...
+	docker kill dotfiles-dev &>/dev/null &>/dev/null && echo -e ${GREEN} "***" ${CLEAR} Killed container: dotfiles-dev || echo -e ${BLUE} "***" ${CLEAR} no containers to stop
+	docker rm dotfiles-dev &>/dev/null && echo -e ${GREEN} "***" ${CLEAR} Removed container: dotfiles-dev || echo -e ${BLUE} "***" ${CLEAR} no containers to remove