From 2749f6816eba68b77062253f2878e964e29b752b Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Mon, 28 Sep 2020 15:23:09 -0500
Subject: [PATCH] Unify status with list

---
 firestarter | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/firestarter b/firestarter
index 8438f3d..c5d83b6 100755
--- a/firestarter
+++ b/firestarter
@@ -151,27 +151,34 @@ fslist() {
 		# Skip our logs directory
 		[ -d "$file" ] && continue
 		if [ -t 1 ]; then
+			local len=16
+			local status
+			local errrorline
 			if gettarget "$file"; then
-				printf "$(basename -- "$file"): \e[32m$_return\e[0m\n"
+				status="\e[32m●\e[0m"
+				errorline="$_return"
 			else
 				local targeterror="$?"
-				local errrorline
 				case $targeterror in
 					2)
-						errorline="\e[31mNo matches found"
+						status="\e[31m●\e[0m"
+						errorline="\e[31mNo matches found\e[0m"
 						;;
 					50)
-						errorline="\e[33mNot an fsdefaults service"
+						status="\e[33m●\e[0m"
+						errorline="\e[33mNot an fsdefaults service\e[0m"
 						;;
 					51)
-						errorline="\e[35mDisabled"
+						status="\e[35m○\e[0m"
+						errorline="\e[35mDisabled\e[0m"
 						;;
 					*)
-						errorline="\e[31mNot a valid file"
+						status="\e[31m●\e[0m"
+						errorline="\e[31mNot a valid file\e[0m"
 						;;
 				esac
-				printf "$(basename -- "$file"): $errorline\e[0m\n"
 			fi
+			printf "$status %-${len}.${len}s$errorline\n" "$(basename -- "$file")"
 		else
 			if gettarget "$file"; then
 				echo "$(basename -- "$file")"