wip3

gen-makefile

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -eo pipefail
 [ -f Makefile ] && mv Makefile Makefile.bak
 CHR_UPGRADE='^'
 CHR_UNINSTALL='/'
@@ -22,7 +23,6 @@ for file in ./install/*; do
 done;
 
 cat << EOF >> Makefile
-
 #===============================================
 #	Scripts listed in ./packs
 #===============================================
@@ -34,17 +34,19 @@ for file in ./packs/*; do
     echo >> Makefile
 done;
 
-
 cat << EOF >> Makefile
 #===============================================
-#	Scripts listed in ./upgrade
+#	Upgrade targets (use install script with 'upgrade' arg)
 #===============================================
 
 EOF
 
-for file in ./upgrade/*; do
+for file in ./install/*; do
     name=${file##*/}
     name=${name%.sh}
+    [ "$name" = "_example" ] && continue
+    has_upgrade=$(grep -q '^upgrade() {' ${file} && echo yes || echo no)
+    [ "$has_upgrade" = "no" ] && continue
     desc=$(grep -m 1 -oP "(?<=^##makedesc:\s).*$" ${file})
     [ -z "$desc" ] && desc='<no description>'
     echo -e "##${CHR_UPGRADE}${name}: ${desc}\n${CHR_UPGRADE}${name}:\n\t@${file} upgrade\n" >> Makefile
@@ -52,14 +54,17 @@ done;
 
 cat << EOF >> Makefile
 #===============================================
-#	Scripts listed in ./uninstall
+#	Remove targets (use install script with 'remove' arg)
 #===============================================
 
 EOF
 
-for file in ./uninstall/*; do
+for file in ./install/*; do
     name=${file##*/}
     name=${name%.sh}
+    [ "$name" = "_example" ] && continue
+    has_remove=$(grep -q '^remove() {' ${file} && echo yes || echo no)
+    [ "$has_remove" = "no" ] && continue
     desc=$(grep -m 1 -oP "(?<=^##makedesc:\s).*$" ${file})
     [ -z "$desc" ] && desc='<no description>'
     echo -e "##${CHR_UNINSTALL}${name}: ${desc}\n${CHR_UNINSTALL}${name}:\n\t@${file} remove\n" >> Makefile