From 86c7c92ae0ac2df448957c8f90713f5ad52a74a9 Mon Sep 17 00:00:00 2001
From: Anthony Axenov <anthonyaxenov@gmail.com>
Date: Wed, 12 Apr 2023 19:05:12 +0800
Subject: [PATCH] fixes in makefile generation

---
 Makefile     | 16 ++++++----------
 gen-makefile |  8 ++------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 8c4ec52..d3bc5d5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Autogenerated at 12.04.2023 17:02 using ./gen-makefile
+# Autogenerated at 12.04.2023 19:04 using ./gen-makefile
 .DEFAULT_GOAL := help
 
 #===============================================
@@ -234,7 +234,7 @@ phpstack: php phptools
 #	Scripts listed in ./upgrade
 #===============================================
 
-# Upgrade omz
+##^omz: Upgrade omz
 ^omz:
 	@./upgrade/omz
 
@@ -242,19 +242,19 @@ phpstack: php phptools
 #	Scripts listed in ./uninstall
 #===============================================
 
-# Uninstall docker + ppa
+##/docker: Uninstall docker + ppa
 /docker:
 	@./uninstall/docker
 
-# Uninstall lite-xl
+##/lite-xl: Uninstall lite-xl
 /lite-xl:
 	@./uninstall/lite-xl
 
-# Uninstall omz
+##/omz: Uninstall omz
 /omz:
 	@./uninstall/omz
 
-# Uninstall vivaldi + ppa
+##/vivaldi: Uninstall vivaldi + ppa
 /vivaldi:
 	@./uninstall/vivaldi
 
@@ -280,7 +280,3 @@ help: Makefile
 	@sed -n 's/^##//p' $< | column -ts ':' | sed -e "s/^/\t/"
 +%:
 	@make 
-^%:
-	@./upgrade/
-@%:
-	@./uninstall/
diff --git a/gen-makefile b/gen-makefile
index e0cbb7a..725ce40 100755
--- a/gen-makefile
+++ b/gen-makefile
@@ -47,7 +47,7 @@ for file in ./upgrade/*; do
     name=${name%.sh}
     desc=$(grep -m 1 -oP "(?<=^##makedesc:\s).*$" ${file})
     [ -z "$desc" ] && desc='<no description>'
-    echo -e "# ${desc}\n${CHR_UPGRADE}${name}:\n\t@${file}\n" >> Makefile
+    echo -e "##${CHR_UPGRADE}${name}: ${desc}\n${CHR_UPGRADE}${name}:\n\t@${file}\n" >> Makefile
 done;
 
 cat << EOF >> Makefile
@@ -62,7 +62,7 @@ for file in ./uninstall/*; do
     name=${name%.sh}
     desc=$(grep -m 1 -oP "(?<=^##makedesc:\s).*$" ${file})
     [ -z "$desc" ] && desc='<no description>'
-    echo -e "# ${desc}\n${CHR_UNINSTALL}${name}:\n\t@${file}\n" >> Makefile
+    echo -e "##${CHR_UNINSTALL}${name}: ${desc}\n${CHR_UNINSTALL}${name}:\n\t@${file}\n" >> Makefile
 done;
 
 cat << EOF >> Makefile
@@ -88,10 +88,6 @@ help: Makefile
 	@sed -n 's/^##//p' $< | column -ts ':' | sed -e "s/^/\t/"
 +%:
 	@make $*
-^%:
-	@./upgrade/$*
-@%:
-	@./uninstall/$*
 EOF
 
 echo "New ./Makefile has been generated!"