anthony
/
my-env
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fixes in makefile generation

master^2
Anthony Axenov 2023-04-12 19:05:12 +08:00
parent 4670ee9b57
commit 86c7c92ae0
Signed by: anthony
GPG Key ID: EA9EC32FF7CCD4EC
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -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/

8
gen-makefile
View File

@ -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!"