fix(Makefile): use correct git shell path and add semicolons#1346
fix(Makefile): use correct git shell path and add semicolons#1346L3MON4D3 merged 2 commits intoL3MON4D3:masterfrom
Conversation
|
Hi! |
|
Of course :) |
|
@L3MON4D3 I believe this PR is ready to be merged, as another user has provided positive feedback: #1220 (comment). Also, what do you think about switching from Makefile's diff --git a/Makefile b/Makefile
index fff60df..9205201 100644
--- a/Makefile
+++ b/Makefile
@@ -157,8 +157,8 @@ test_nix: nvim install_jsregexp
spellcheck:
# grabbed from word-warden.
# Misspelled words will appear inside the following tests:
- if [ -n "$(shell aspell --home-dir . --encoding=utf-8 --mode markdown --lang en_US --personal ./data/project-dictionary.txt list < README.md)" ]; then exit 1; fi;
- if [ -n "$(shell aspell --home-dir . --encoding=utf-8 --mode markdown --lang en_US --personal ./data/project-dictionary.txt list < DOC.md)" ]; then exit 1; fi;
+ if [ -n "$$(aspell --home-dir . --encoding=utf-8 --mode markdown --lang en_US --personal ./data/project-dictionary.txt list < README.md)" ]; then exit 1; fi;
+ if [ -n "$$(aspell --home-dir . --encoding=utf-8 --mode markdown --lang en_US --personal ./data/project-dictionary.txt list < DOC.md)" ]; then exit 1; fi;
spellcheck_interactive:
aspell --home-dir . --encoding=utf-8 --mode markdown --lang en_US --personal ./data/project-dictionary.txt check DOC.md; |
Wonderful, thank you for managing that ❤️
I think I actually considered using This shows the output when there is a misspelled word, top is I'll merge this for now, Thank You for continuing your support-work for windows! |

Problem:
PR #1343 did not use the correct git shell path as the space is not escaped.
Solution:
Adding a backslash to escape the space does not fix the issue as
SHELLstill expands tosh.exeeven after assignment. Instead of directly copying$(WIN_GIT_SHELL), use$(wildcard $(WIN_GIT_SHELL))returned from the Makefile function to overwriteSHELL.Similar to PR feat(Makefile): enable auto detect compiler #1282 on
$(shell %COMMAND%), semicolons are added after each command to make suremakecan callCreateProcesscorrectly:CreateProcess(NULL,%COMMAND%,...)CreateProcess(NULL,$(SHELL) $(.SHELLFLAGS) "%COMMAND%;",...)