1 files changed, 22 insertions, 21 deletions

diff --git a/src/recipes.c b/src/recipes.c
index b84a026..206d7d2 100644
--- a/src/recipes.c
+++ b/src/recipes.c
@@ -26,13 +26,19 @@
 #include "pkg.h"
 #include "state.h"
 
-#define try_pkg_fn(fn, pkg, operation)                                         \
+#define try_pkg_fn(fn, pkg, operation, smol)                                   \
 	do {                                                                       \
-		log_info("attempting to %s '%.*s'", operation, str_fmt(&(pkg)->name)); \
+		if (pkg_read_status(smol, pkg)) return true;                           \
+		if (!flags.quiet) log_info("'%.*s' %s in progress...",                 \
+			str_fmt(&(pkg)->name), operation);                                 \
 		if (!(fn((pkg)))) {                                                    \
 			log_error("%s failed", operation);                                 \
 			return false;                                                      \
 		}                                                                      \
+		char big[2] = "\0";                                                    \
+		big[0] = smol;                                                         \
+		if (!pkg_write_status(big, pkg)) return false;                         \
+		log_info("'%.*s' %s done", str_fmt(&(pkg)->name), operation);          \
 	} while (0)
 
 static bool pkg_write_status(const char *status, package_t *pkg) {
@@ -92,34 +98,28 @@ static bool pkg_enter(package_t *pkg) {
 
 bool pkg_setup(package_t *pkg) {
 	if (pkg_read_status('s', pkg)) return true;
-	try_pkg_fn(pkg_enter, pkg, "enter");
-	try_pkg_fn(pkg_hook_setup, pkg, "setup");
-	if (!pkg_write_status("s", pkg)) return false;
+	try_pkg_fn(pkg_enter, pkg, "enter", 'e');
+	try_pkg_fn(pkg_hook_setup, pkg, "setup", 's');
+	log_success("'%.*s' set up", str_fmt(&pkg->name));
 	return true;
 }
 
 bool pkg_build(package_t *pkg) {
 	if (pkg_read_status('b', pkg)) return true;
-	try_pkg_fn(pkg_enter, pkg, "enter");
-	try_pkg_fn(pkg_hook_build, pkg, "build");
-	if (!pkg_write_status("b", pkg)) return false;
+	try_pkg_fn(pkg_enter, pkg, "enter", 'e');
+	try_pkg_fn(pkg_hook_build, pkg, "build", 'b');
+	log_success("'%.*s' built", str_fmt(&pkg->name));
 	return true;
 }
 
 bool pkg_install(package_t *pkg) {
 	if (is_pkg_installed(pkg) && !flags.force) return true;
-	log_info("fetching '%.*s'", str_fmt(&pkg->name));
-	if (!pkg_read_status('f', pkg) && !pkg_fetch_sources(pkg)) return false;
-	log_info("entering '%.*s'", str_fmt(&pkg->src));
-	if (!pkg_read_status('e', pkg) && !pkg_enter(pkg)) return false;
-	log_info("setting up '%.*s'", str_fmt(&pkg->name));
-	if (!pkg_read_status('s', pkg) && !pkg_hook_setup(pkg)) return false;
-	log_info("building '%.*s'", str_fmt(&pkg->name));
-	if (!pkg_read_status('b', pkg) && !pkg_hook_build(pkg)) return false;
-	log_info("installing '%.*s'", str_fmt(&pkg->name));
-	if (!pkg_hook_install(pkg)) return false;
-	if (!pkg_write_status("i", pkg)) return false;
-	log_success("installed '%.*s'", str_fmt(&pkg->name));
+	try_pkg_fn(pkg_fetch_sources, pkg, "fetch", 'f');
+	try_pkg_fn(pkg_enter, pkg, "enter", 'e');
+	try_pkg_fn(pkg_hook_setup, pkg, "setup", 's');
+	try_pkg_fn(pkg_hook_build, pkg, "build", 'b');
+	try_pkg_fn(pkg_hook_install, pkg, "install", 'i');
+	log_success("'%.*s' installed", str_fmt(&pkg->name));
 	return true;
 }
 
@@ -127,11 +127,12 @@ bool pkg_remove(package_t *pkg) {
 	if (!pkg_enter(pkg)) return false;
 	if (!pkg_hook_remove(pkg)) return false;
 	if (!rmrf(&pkg->root)) return false;
-	log_success("removed '%.*s'", str_fmt(&pkg->name));
+	log_success("'%.*s' removed", str_fmt(&pkg->name));
 	return true;
 }
 
 bool pkg_update(package_t *pkg) {
 	pkg_install(pkg);
+	log_success("'%.*s' updated", str_fmt(&pkg->name));
 	return true;
 }