Simplify Makefile output

compose/Makefile

@@ -6,7 +6,7 @@ green  = $(shell printf "\e[32;01m$1\e[0m")
 yellow = $(shell printf "\e[33;01m$1\e[0m")
 red    = $(shell printf "\e[33;31m$1\e[0m")
 
-format = $(shell printf "%s %-38s %s" "$(call yellow,$1)" "$(call green,$2)" $3)
+format = $(shell printf "%-40s %s" "$(call green,bin/$1)" $2)
 
 comma:= ,
 
@@ -17,52 +17,52 @@ comma:= ,
 
 help:
 	@echo ""
-	@echo "$(call green,Use the following CLI commands:)"
+	@echo "$(call yellow,Use the following CLI commands:)"
 	@echo "$(call red,===============================)"
-	@echo "$(call format,make,help,'Print list of commands with comment.')"
-	@echo "$(call format,make,bash,'Drop into the bash prompt of your Docker container.')"
-	@echo "$(call format,make,cache-clean,'Access the cache-clean CLI.')"
-	@echo "$(call format,make,cli,'Run any CLI command without going into the bash prompt.')"
-	@echo "$(call format,make,clinotty,'Run any CLI command with no TTY.')"
-	@echo "$(call format,make,cliq,'Run any CLI command but pipes all output to /dev/null.')"
-	@echo "$(call format,make,composer,'Run the composer binary.')"
-	@echo "$(call format,make,copyfromcontainer,'Copy folders or files from container to host.')"
-	@echo "$(call format,make,copytocontainer,'Copy folders or files from host to container.')"
-	@echo "$(call format,make,cron,'Start or stop the cron service.')"
-	@echo "$(call format,make,dev-urn-catalog-generate,'Generate URNs for PHPStorm and remap paths to local host.')"
-	@echo "$(call format,make,devconsole,'Alias for n98-magerun2 dev:console.')"
-	@echo "$(call format,make,devtools-cli-check,'Check & install the CLI devtools if missing from system.')"
-	@echo "$(call format,make,download,'Download & extract specific Magento version to the src directory.')"
-	@echo "$(call format,make,fixowns,'This will fix filesystem ownerships within the container.')"
-	@echo "$(call format,make,fixperms,'This will fix filesystem permissions within the container.')"
-	@echo "$(call format,make,grunt,'Run the grunt binary.')"
-	@echo "$(call format,make,magento,'Run the Magento CLI.')"
-	@echo "$(call format,make,mftf,'Run the Magento MFTF.')"
-	@echo "$(call format,make,mysql,'Run the MySQL CLI with database config from env/db.env.')"
-	@echo "$(call format,make,mysqldump,'Backup the Magento database.')"
-	@echo "$(call format,make,n98-magerun2,'Access the n98-magerun2 CLI.')"
-	@echo "$(call format,make,node,'Run the node binary.')"
-	@echo "$(call format,make,npm,'Run the npm binary.')"
-	@echo "$(call format,make,pwa-studio,'(BETA) Start the PWA Studio server.')"
-	@echo "$(call format,make,redis,'Run a command from the redis container.')"
-	@echo "$(call format,make,remove,'Remove all containers.')"
-	@echo "$(call format,make,removeall,'Remove all containers$(comma) networks$(comma) volumes$(comma) and images.')"
-	@echo "$(call format,make,removevolumes,'Remove all volumes.')"
-	@echo "$(call format,make,restart,'Stop and then start all containers.')"
-	@echo "$(call format,make,root,'Run any CLI command as root without going into the bash prompt.')"
-	@echo "$(call format,make,rootnotty,'Run any CLI command as root with no TTY.')"
-	@echo "$(call format,make,setup,'Run the Magento setup process$(comma) with optional domain name.')"
-	@echo "$(call format,make,setup-composer-auth,'Setup authentication credentials for Composer.')"
-	@echo "$(call format,make,setup-domain,'Setup Magento domain name.')"
-	@echo "$(call format,make,setup-grunt,'Install and configure Grunt JavaScript task runner.')"
-	@echo "$(call format,make,setup-pwa-studio,'(BETA) Install PWA Studio.')"
-	@echo "$(call format,make,setup-ssl,'Generate an SSL certificate for one or more domains.')"
-	@echo "$(call format,make,setup-ssl-ca,'Generate a certificate authority and copy it to the host.')"
-	@echo "$(call format,make,start,'Start all containers.')"
-	@echo "$(call format,make,status,'Check the container status.')"
-	@echo "$(call format,make,stop,'Stop all containers.')"
-	@echo "$(call format,make,update,'Stop all containers.')"
-	@echo "$(call format,make,xdebug,'Disable or enable Xdebug.')"
+	@echo "$(call format,help,'Print list of commands with comment.')"
+	@echo "$(call format,bash,'Drop into the bash prompt of your Docker container.')"
+	@echo "$(call format,cache-clean,'Access the cache-clean CLI.')"
+	@echo "$(call format,cli,'Run any CLI command without going into the bash prompt.')"
+	@echo "$(call format,clinotty,'Run any CLI command with no TTY.')"
+	@echo "$(call format,cliq,'Run any CLI command but pipes all output to /dev/null.')"
+	@echo "$(call format,composer,'Run the composer binary.')"
+	@echo "$(call format,copyfromcontainer,'Copy folders or files from container to host.')"
+	@echo "$(call format,copytocontainer,'Copy folders or files from host to container.')"
+	@echo "$(call format,cron,'Start or stop the cron service.')"
+	@echo "$(call format,dev-urn-catalog-generate,'Generate URNs for PHPStorm and remap paths to local host.')"
+	@echo "$(call format,devconsole,'Alias for n98-magerun2 dev:console.')"
+	@echo "$(call format,devtools-cli-check,'Check & install the CLI devtools if missing from system.')"
+	@echo "$(call format,download,'Download & extract specific Magento version to the src directory.')"
+	@echo "$(call format,fixowns,'This will fix filesystem ownerships within the container.')"
+	@echo "$(call format,fixperms,'This will fix filesystem permissions within the container.')"
+	@echo "$(call format,grunt,'Run the grunt binary.')"
+	@echo "$(call format,magento,'Run the Magento CLI.')"
+	@echo "$(call format,mftf,'Run the Magento MFTF.')"
+	@echo "$(call format,mysql,'Run the MySQL CLI with database config from env/db.env.')"
+	@echo "$(call format,mysqldump,'Backup the Magento database.')"
+	@echo "$(call format,n98-magerun2,'Access the n98-magerun2 CLI.')"
+	@echo "$(call format,node,'Run the node binary.')"
+	@echo "$(call format,npm,'Run the npm binary.')"
+	@echo "$(call format,pwa-studio,'(BETA) Start the PWA Studio server.')"
+	@echo "$(call format,redis,'Run a command from the redis container.')"
+	@echo "$(call format,remove,'Remove all containers.')"
+	@echo "$(call format,removeall,'Remove all containers$(comma) networks$(comma) volumes$(comma) and images.')"
+	@echo "$(call format,removevolumes,'Remove all volumes.')"
+	@echo "$(call format,restart,'Stop and then start all containers.')"
+	@echo "$(call format,root,'Run any CLI command as root without going into the bash prompt.')"
+	@echo "$(call format,rootnotty,'Run any CLI command as root with no TTY.')"
+	@echo "$(call format,setup,'Run the Magento setup process$(comma) with optional domain name.')"
+	@echo "$(call format,setup-composer-auth,'Setup authentication credentials for Composer.')"
+	@echo "$(call format,setup-domain,'Setup Magento domain name.')"
+	@echo "$(call format,setup-grunt,'Install and configure Grunt JavaScript task runner.')"
+	@echo "$(call format,setup-pwa-studio,'(BETA) Install PWA Studio.')"
+	@echo "$(call format,setup-ssl,'Generate an SSL certificate for one or more domains.')"
+	@echo "$(call format,setup-ssl-ca,'Generate a certificate authority and copy it to the host.')"
+	@echo "$(call format,start,'Start all containers.')"
+	@echo "$(call format,status,'Check the container status.')"
+	@echo "$(call format,stop,'Stop all containers.')"
+	@echo "$(call format,update,'Stop all containers.')"
+	@echo "$(call format,xdebug,'Disable or enable Xdebug.')"
 
 bash:
 	@./bin/bash