diff options
Diffstat (limited to '')
| -rw-r--r-- | default.nix | 9 | ||||
| -rwxr-xr-x | scripts/tidy-content.sh | 35 |
2 files changed, 1 insertions, 43 deletions
diff --git a/default.nix b/default.nix index 98ac3c3..0a5ad82 100644 --- a/default.nix +++ b/default.nix @@ -33,15 +33,10 @@ in rec { }); docs = utils.baseTask.overrideAttrs (baseAttrs: { name = "${baseAttrs.name}-docs"; - buildInputs = [ jekyllEnv pkgs.html-tidy pkgs.moreutils ]; + buildInputs = [ jekyllEnv ]; buildPhase = '' patchShebangs . jekyll build -d $out - ./scripts/tidy-content.sh $out || { - echo 'Error in formatting HTML. Reproduce with: ' - echo ' jekyll build && ./scripts/tidy-content.sh _site/' - exit 1 - } ''; }); }; @@ -58,8 +53,6 @@ in rec { buildInputs = [ 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 deleted file mode 100755 index 14e2edc..0000000 --- a/scripts/tidy-content.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash -set -Eeuo pipefail - -end="\033[0m" -red="\033[0;31m" -red() { echo -e "${red}${1}${end}"; } - -usage() { - red "Missing argument <${1}>.\n" - cat <<EOF -Usage: - $0 <INPUT_DIR> - - Arguments: - INPUT_DIR Input directory with the static HTML to be tidy-ed - -Examples: - $0 _site/ -EOF -} - -INPUT_DIR="${1:-}" -[[ -z "${INPUT_DIR}" ]] && { - usage 'INPUT_DIR' - exit 2 -} - -format() { - echo "${1}" >&2 - tidy --quiet yes -utf8 -indent <(tidy --quiet yes -utf8 -indent "${1}") | sponge "${1}" -} -export -f format - -find "${INPUT_DIR}" -type f -name '*.html' -print0 | \ - xargs -0 -I{} bash -c "format {}" |