Bruce/nomsu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated makefile to handle escapes in echoed output using printf

Browse Source
This commit is contained in:
Bruce Hill 2019-09-20 14:22:51 -07:00
parent 8ef787572a
commit 5396b2a9ef
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -35,9 +35,9 @@ all: lua optimize optimize_extra
.PHONY: test .PHONY: test
test: lua optimize test: lua optimize
@echo "\033[1;4mRunning unoptimized tests...\033[0m" @printf "\033[1;4mRunning unoptimized tests...\033[0m\n"
@$(LUA_BIN) nomsu.lua -O0 -t test $(CORE_NOM_FILES) $(LIB_NOM_FILES) @$(LUA_BIN) nomsu.lua -O0 -t test $(CORE_NOM_FILES) $(LIB_NOM_FILES)
@echo "\n\033[1;4mRunning optimized tests...\033[0m" @printf "\n\033[1;4mRunning optimized tests...\033[0m\n"
@$(LUA_BIN) nomsu.lua -O1 -t test $(CORE_LUA_FILES) $(LIB_LUA_FILES) @$(LUA_BIN) nomsu.lua -O1 -t test $(CORE_LUA_FILES) $(LIB_LUA_FILES)
%.lua: %.moon %.lua: %.moon
@ -60,7 +60,7 @@ optimize_extra: lua $(COMPAT_LUA_FILES) $(TOOL_LUA_FILES)
.PHONY: clean .PHONY: clean
clean: clean:
@echo "\033[1mDeleting...\033[0m" @printf "\033[1mDeleting...\033[0m"
@rm -rvf version lib/*.lua lib/*/*.lua @rm -rvf version lib/*.lua lib/*/*.lua
.PHONY: install .PHONY: install
@ -76,7 +76,7 @@ install: lua version optimize optimize_extra
fi; \ fi; \
if [[ ! $$packagepath ]]; then packagepath="/opt"; fi; \ if [[ ! $$packagepath ]]; then packagepath="/opt"; fi; \
if [[ $$prefix != "`realpath $$prefix`" ]]; then \ if [[ $$prefix != "`realpath $$prefix`" ]]; then \
echo $$'\033[1;31mWarning: '$$prefix$$' is not an absolute path. This may cause problems.\033[0m'; \ printf $$'\033[1;31mWarning: '$$prefix$$' is not an absolute path. This may cause problems.\033[0m\n'; \
read -p $$'\033[1mWould you rather use '`realpath $$prefix`$$' instead? (recommended)[Y/n]\033[0m ' use_real; \ read -p $$'\033[1mWould you rather use '`realpath $$prefix`$$' instead? (recommended)[Y/n]\033[0m ' use_real; \
if [[ ! $$use_real =~ ^[Nn] ]]; then \ if [[ ! $$use_real =~ ^[Nn] ]]; then \
prefix="`realpath $$prefix`"; \ prefix="`realpath $$prefix`"; \
@ -84,7 +84,7 @@ install: lua version optimize optimize_extra
fi; \ fi; \
version="`cat version`"; \ version="`cat version`"; \
mkdir -pv $$prefix/bin $$prefix/lib/nomsu/$$version $$prefix/share/nomsu/$$version $$prefix/share/man/man1 $$packagepath/nomsu \ mkdir -pv $$prefix/bin $$prefix/lib/nomsu/$$version $$prefix/share/nomsu/$$version $$prefix/share/man/man1 $$packagepath/nomsu \
&& echo "#!$(LUA_BIN)\\nNOMSU_PREFIX, NOMSU_PACKAGEPATH = [[$$prefix]], [[$$packagepath/nomsu]]" \ && printf "#!$(LUA_BIN)\nNOMSU_PREFIX, NOMSU_PACKAGEPATH = [[$$prefix]], [[$$packagepath/nomsu]]" \
| cat - nomsu.lua > $$prefix/bin/nomsu$$version \ | cat - nomsu.lua > $$prefix/bin/nomsu$$version \
&& chmod +x $$prefix/bin/nomsu$$version \ && chmod +x $$prefix/bin/nomsu$$version \
&& cp -v nomsu $$prefix/bin \ && cp -v nomsu $$prefix/bin \
@ -98,13 +98,13 @@ uninstall: version
read -p $$'\033[1mWhere do you want to uninstall Nomsu from? (default: /usr/local) \033[0m' prefix; \ read -p $$'\033[1mWhere do you want to uninstall Nomsu from? (default: /usr/local) \033[0m' prefix; \
fi; \ fi; \
if [[ ! $$prefix ]]; then prefix="/usr/local"; fi; \ if [[ ! $$prefix ]]; then prefix="/usr/local"; fi; \
echo "\033[1mNomsu will be uninstalled from:\033[0m"; \ printf "\033[1mNomsu will be uninstalled from:\033[0m\n"; \
echo " $$prefix/bin"; \ echo " $$prefix/bin"; \
echo " $$prefix/lib"; \ echo " $$prefix/lib"; \
echo " $$prefix/share"; \ echo " $$prefix/share"; \
read -p $$'\033[1mis this okay? [Y/n]\033[0m ' ans; \ read -p $$'\033[1mis this okay? [Y/n]\033[0m ' ans; \
if [[ $$ans =~ ^[Nn] ]]; then exit; fi; \ if [[ $$ans =~ ^[Nn] ]]; then exit; fi; \
echo "\033[1mDeleting...\033[0m"; \ printf "\033[1mDeleting...\033[0m\n"; \
version="$(UNINSTALL_VERSION)"; \ version="$(UNINSTALL_VERSION)"; \
if [[ ! $$version ]]; then version="`cat version`"; fi;\ if [[ ! $$version ]]; then version="`cat version`"; fi;\
rm -rvf $$prefix/lib/nomsu/$$version $$prefix/share/nomsu/$$version $$prefix/bin/nomsu$$version; \ rm -rvf $$prefix/lib/nomsu/$$version $$prefix/share/nomsu/$$version $$prefix/bin/nomsu$$version; \
@ -114,14 +114,14 @@ uninstall: version
if [ -f $$prefix/bin/nomsu ]; then \ if [ -f $$prefix/bin/nomsu ]; then \
read -p $$'\033[1mIt looks like there are other versions of Nomsu installed. Is it okay to leave the "nomsu" cross-version launcher in place? (recommended) [Y/n]\033[0m ' ans; \ read -p $$'\033[1mIt looks like there are other versions of Nomsu installed. Is it okay to leave the "nomsu" cross-version launcher in place? (recommended) [Y/n]\033[0m ' ans; \
if [[ $$ans =~ ^[Nn] ]]; then \ if [[ $$ans =~ ^[Nn] ]]; then \
echo "\033[1mDeleting...\033[0m"; \ printf "\033[1mDeleting...\033[0m\n"; \
rm -vf $$prefix/bin/nomsu $$prefix/share/man/man1/nomsu.1; \ rm -vf $$prefix/bin/nomsu $$prefix/share/man/man1/nomsu.1; \
fi; \ fi; \
fi; \ fi; \
fi; \ fi; \
if [ "`ls $$prefix/lib/nomsu 2>/dev/null`" == "" ]; then rm -rvf $$prefix/lib/nomsu; fi;\ if [ "`ls $$prefix/lib/nomsu 2>/dev/null`" == "" ]; then rm -rvf $$prefix/lib/nomsu; fi;\
if [ "`ls $$prefix/share/nomsu 2>/dev/null`" == "" ]; then rm -rvf $$prefix/share/nomsu; fi;\ if [ "`ls $$prefix/share/nomsu 2>/dev/null`" == "" ]; then rm -rvf $$prefix/share/nomsu; fi;\
echo $$'\033[1mDone.\033[0m'; printf $$'\033[1mDone.\033[0m\n';
uninstallpackages: uninstallpackages:
@packagepath="$(PACKAGEPATH)"; \ @packagepath="$(PACKAGEPATH)"; \