Makefile.am: move spellcheck-interactive into "HIDE FROM AUTOMAKE" block to differentiate the logic, and save newly trusted key words into nut-website.dict.addon [networkupstools/nut#2402]

Signed-off-by: Jim Klimov <[email protected]>

Author: jimklimov

.gitignore

@@ -25,6 +25,7 @@ historic-release.txt
 *.usage-report
 /nut-website.dict
 /nut-website.dict.bak-pre-sorting
+/nut-website.dict.bak-pre-interactive
 /nut-website.dict.sorted
 /.nut-website.dict.sorted
 /nut-website.dict.tmp

Makefile.am

@@ -298,7 +298,7 @@ clean-local:
 		scripts/ups_data.js
 	git checkout -f images || true
 	rm -f *-spellchecked protocols/*-spellchecked nut-website.dict *.usage-report
-	rm -f nut-website.dict.bak-pre-sorting nut-website.dict.sorted .nut-website.dict.sorted nut-website.dict.tmp
+	rm -f nut-website.dict.bak-pre-sorting nut-website.dict.sorted .nut-website.dict.sorted nut-website.dict.tmp nut-website.bak-pre-interactive
 	rm -f tools/nut-ddl.py tools/nut-hclinfo.py
 	rm -f historic-release.txt
 	rm -f .git-commit-website
@@ -680,12 +680,15 @@ nut-website.dict: $(top_builddir)/nut/docs/nut.dict nut-website.dict.addon
 
 # Indented GNUmake "if/else/endif"
 # HIDE FROM AUTOMAKE # ifeq (,$(strip $(NUT_SPELL_DICT)))
+# HIDE FROM AUTOMAKE #
 # HIDE FROM AUTOMAKE ## Pass to original NUT recipe and its dict file alone
 # HIDE FROM AUTOMAKE #NUT_SPELL_DICT_OPTION =
-# HIDE FROM AUTOMAKE #spellcheck-sortdict:
+# HIDE FROM AUTOMAKE #spellcheck-sortdict spellcheck-interactive:
 # HIDE FROM AUTOMAKE #	@echo "$@ for NUT-source-only NUT_SPELL_DICT (NUT_SPELL_DICT_DEBUGTAG=$(NUT_SPELL_DICT_DEBUGTAG))" >&2
 # HIDE FROM AUTOMAKE #	+cd "$(abs_top_builddir)/nut/docs/" && $(MAKE) $(AM_MAKEFLAGS) SPELLCHECK_SRC="$(addprefix ../../,$(SPELLCHECK_SRC))" $@
+# HIDE FROM AUTOMAKE #
 # HIDE FROM AUTOMAKE # else
+# HIDE FROM AUTOMAKE #
 # HIDE FROM AUTOMAKE #export NUT_SPELL_DICT
 # HIDE FROM AUTOMAKE #NUT_SPELL_DICT_OPTION = NUT_SPELL_DICT="../../$(notdir $(strip $(NUT_SPELL_DICT)))" NUT_SPELL_DICT_ABS="$(abs_top_builddir)/$(notdir $(strip $(NUT_SPELL_DICT)))"
 # HIDE FROM AUTOMAKE #
@@ -699,10 +702,19 @@ nut-website.dict: $(top_builddir)/nut/docs/nut.dict nut-website.dict.addon
 # HIDE FROM AUTOMAKE #		> nut-website.dict.addon.sorted
 # HIDE FROM AUTOMAKE #	@test -s nut-website.dict.addon.sorted || { echo "ERROR: $@ for NUT_SPELL_DICT=$< yielded an empty file; we expect some unique words here!" >&2; exit 1; }
 # HIDE FROM AUTOMAKE #	@mv -f nut-website.dict.addon.sorted "$(abs_top_srcdir)/nut-website.dict.addon"
+# HIDE FROM AUTOMAKE #
+# HIDE FROM AUTOMAKE #spellcheck-interactive: $(NUT_SPELL_DICT)
+# HIDE FROM AUTOMAKE #	@echo "$@ for NUT_SPELL_DICT=$< (NUT_SPELL_DICT_DEBUGTAG=$(NUT_SPELL_DICT_DEBUGTAG))" >&2
+# HIDE FROM AUTOMAKE #	cp -f "$(NUT_SPELL_DICT)" "$(NUT_SPELL_DICT).bak-pre-interactive"
+# HIDE FROM AUTOMAKE #	+cd "$(abs_top_builddir)/nut/docs/" && $(MAKE) $(AM_MAKEFLAGS) SPELLCHECK_SRC="$(addprefix ../../,$(SPELLCHECK_SRC))" $(NUT_SPELL_DICT_OPTION) $@
+# HIDE FROM AUTOMAKE #	diff -bu "$(NUT_SPELL_DICT).bak-pre-interactive" "$(NUT_SPELL_DICT)" | grep -E '^\+[^\+]' | sed 's/^\+//' | grep -vE '^personal_ws' >> "$(abs_top_srcdir)/nut-website.dict.addon"
+# HIDE FROM AUTOMAKE #	rm -f "$(NUT_SPELL_DICT).bak-pre-interactive"
+# HIDE FROM AUTOMAKE #	+$(MAKE) $(AM_MAKEFLAGS) spellcheck-sortdict-addon
+# HIDE FROM AUTOMAKE #
 # HIDE FROM AUTOMAKE # endif
 
 # Whether we have a custom dictionary or not:
-spellcheck spellcheck-interactive spellcheck-report-dict-usage: $(NUT_SPELL_DICT)
+spellcheck spellcheck-report-dict-usage: $(NUT_SPELL_DICT)
 	@echo "$@ for NUT_SPELL_DICT=$< (NUT_SPELL_DICT_DEBUGTAG=$(NUT_SPELL_DICT_DEBUGTAG))" >&2
 	+cd "$(abs_top_builddir)/nut/docs/" && $(MAKE) $(AM_MAKEFLAGS) SPELLCHECK_SRC="$(addprefix ../../,$(SPELLCHECK_SRC))" $(NUT_SPELL_DICT_OPTION) $@