diff --git a/Makefile b/Makefile index f5c0aa98cb..5ca4f50007 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ NIX_DEV_MANUAL_OUT = guides all: $(NIX_DEV_MANUAL_OUT) learn_guides.html.in -$(NIX_DEV_MANUAL_OUT) learn_guides.html.in: $(NIX_DEV_MANUAL_IN) layout.tt +$(NIX_DEV_MANUAL_OUT) learn_guides.html.in: $(NIX_DEV_MANUAL_IN) layout.tt copy-nix-dev-tutorials.sh bash copy-nix-dev-tutorials.sh $(NIX_DEV_MANUAL_OUT) diff --git a/copy-nix-dev-tutorials.sh b/copy-nix-dev-tutorials.sh index 7652803301..b6d23d7109 100755 --- a/copy-nix-dev-tutorials.sh +++ b/copy-nix-dev-tutorials.sh @@ -26,8 +26,7 @@ for page in "${pages[@]}"; do echo "
  • $title
  • " >> learn_guides.html.in - echo '[% WRAPPER layout.tt title="Guides - $title" %]' > $target - echo '' >> $target + printf '[%% WRAPPER layout.tt title="Guides - %s" %%]\n\n' "$title" > $target xidel $source --css '.body > *' --printed-node-format=html \ | sed 's|||g' \ @@ -37,6 +36,5 @@ for page in "${pages[@]}"; do | sed 's|../reference/pinning-nixpkgs.html#ref-pinning-nixpkgs|towards-reproducibility-pinning-nixpkgs.html|g' \ >> "$target" - echo '' >> $target - echo "[% END %]" >> $target + printf '\n\n[%% END %%]\n' >> $target done