From cf27d0a7c60a5bae315e1b21cc1bdc7cf68ed2ff Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Wed, 5 Aug 2020 18:16:10 -0300 Subject: Use tidy to format HTML More than to lint it :shrug: --- default.nix | 3 ++- scripts/tidy-content.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/default.nix b/default.nix index 2f10691..98ac3c3 100644 --- a/default.nix +++ b/default.nix @@ -33,7 +33,7 @@ in rec { }); docs = utils.baseTask.overrideAttrs (baseAttrs: { name = "${baseAttrs.name}-docs"; - buildInputs = [ jekyllEnv pkgs.html-tidy ]; + buildInputs = [ jekyllEnv pkgs.html-tidy pkgs.moreutils ]; buildPhase = '' patchShebangs . jekyll build -d $out @@ -59,6 +59,7 @@ in rec { jekyllEnv (pkgs.hunspellWithDicts (with pkgs.hunspellDicts; [ en-us ])) pkgs.html-tidy + pkgs.moreutils ]; }; publishScript = utils.overwritingPublishScript { diff --git a/scripts/tidy-content.sh b/scripts/tidy-content.sh index 6dc13c6..14e2edc 100755 --- a/scripts/tidy-content.sh +++ b/scripts/tidy-content.sh @@ -27,7 +27,7 @@ INPUT_DIR="${1:-}" format() { echo "${1}" >&2 - tidy --quiet yes -utf8 -indent -modify "${1}" + tidy --quiet yes -utf8 -indent <(tidy --quiet yes -utf8 -indent "${1}") | sponge "${1}" } export -f format -- cgit v1.2.3