Final help output

Author: nicholasdille

Makefile

@@ -68,8 +68,8 @@ info: ; $(info $(M) Runtime info...)
 	@echo "ALT_ARCH:           $(ALT_ARCH)"
 
 .PHONY:
-help:
-	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
+help: ## Display this help
+	@perl -lne 'if (/^([\$$a-z][^:]+):(([^:]+):)?/) { if ($$3) {$$name = $$3} else {$$name = $$1} }; if ($$name && / ## (.+)$$/) { printf "%s: \033[36m%-30s\033[0m%s\n", $$name, $$1; $$name = "" }' $(MAKEFILE_LIST)
 	@echo
 	@echo "Reminder: foo-% => \$$@=foo-bar \$$*=bar"
 	@echo

make/ghcr.mk

@@ -148,7 +148,7 @@ ghcr-private: \
 	| column --separator ";" --table --table-columns Name,Url
 
 .PHONY:
-$(addsuffix --ghcr-private,$(ALL_TOOLS_RAW)): \
+$(addsuffix --ghcr-private,$(ALL_TOOLS_RAW)):%--ghcr-private: \
 		$(HELPER)/var/lib/uniget/manifests/gh.json \
 		$(HELPER)/var/lib/uniget/manifests/gojq.json \
 		; $(info $(M) Testing that $* is publicly visible...) ## ???

make/sbom.mk

@@ -35,7 +35,7 @@ sbom: \
 
 .PHONY:
 $(addsuffix --sbom,$(ALL_TOOLS_RAW)):%--sbom: \
-		$(TOOLS_DIR)/%/sbom.json
+		$(TOOLS_DIR)/%/sbom.json ## ???
 
 $(addsuffix /sbom.json,$(ALL_TOOLS)):$(TOOLS_DIR)/%/sbom.json: \
 		$(HELPER)/var/lib/uniget/manifests/gojq.json \
@@ -120,7 +120,7 @@ attest: \
 $(addsuffix --scan,$(ALL_TOOLS_RAW)):%--scan: \
 		$(HELPER)/var/lib/uniget/manifests/grype.json \
 		$(TOOLS_DIR)/%/sbom.json \
-		; $(info $(M) Scanning sbom for $*...)
+		; $(info $(M) Scanning sbom for $*...) ## ???
 	@set -o errexit; \
 	grype sbom:$(TOOLS_DIR)/$*/sbom.json --quiet --add-cpes-if-none --output table