Shlomi Fish avatar Shlomi Fish committed efbacda

Convert tidy to tidyp.

It is more modern and maintained.

Comments (0)

Files changed (1)

 
 $(T2_FORTUNES_ALL__TEMP__HTML): $(T2_FORTUNES_ALL_WML) $(FORTUNES_XHTMLS__FOR_INPUT_PORTIONS)
 
-FORTUNES_TIDY = tidy -asxhtml -utf8 -quiet
+FORTUNES_TIDY = tidyp -asxhtml -utf8 -quiet
 
 $(FORTUNES_XHTMLS__COMPRESSED): %.compressed.xhtml: %.xhtml
 	$(FORTUNES_TIDY) --show-warnings no -o $@ $< || true
 
 $(T2_FORTUNES_ALL__HTML): $(T2_FORTUNES_ALL__TEMP__HTML) $(FORTUNES_WMLS_HTMLS)
 	for f in $(T2_DEST_HTMLS_FORTUNES) ; do \
-		$(FORTUNES_TIDY) -o "$$f".xhtml "$$f"; \
+		$(FORTUNES_TIDY) --show-warnings no -o "$$f".xhtml "$$f" || true; \
 		mv -f "$$f.xhtml" "$$f"; \
 	done
-	$(FORTUNES_TIDY) -o $@ $<
+	$(FORTUNES_TIDY) --show-warnings no -o $@ $< || true
 
 $(FORTUNES_TEXTS): $(T2_FORTUNES_DIR)/%: $(T2_FORTUNES_DIR)/%.xml
 	bash $(T2_FORTUNES_DIR)/run-validator.bash $< && \
 $(SPORK_LECTURES_BASE_STARTS) : $(SPORK_LECTS_SOURCE_BASE)/%/slides/start.html : $(SPORK_LECTS_SOURCE_BASE)/%/Spork.slides $(SPORK_LECTS_SOURCE_BASE)/%/config.yaml
 	(cd $(patsubst %/slides/start.html,%,$@) && \
 		shspork -make && \
-		(cd slides/ && (for I in *.html ; do tidy -asxhtml -o "$$I".new "$$I" ; mv -f "$$I".new "$$I" ; perl -lpi -e 's/[\t ]+\z//' "$$I" ; done)) && \
+		(cd slides/ && (for I in *.html ; do tidyp -asxhtml -o "$$I".new "$$I" ; mv -f "$$I".new "$$I" ; perl -lpi -e 's/[\t ]+\z//' "$$I" ; done)) && \
 		(find template -name '*.js' -or -name '*.html' | xargs perl -lpi -e 's/[\t ]+\z//') \
 	)
 	cp -f common/favicon.png $(patsubst %/start.html,%,$@)/
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.