From 6fa5c4d5709034a4087bab3f2e66ef1f77250656 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Sat, 28 Apr 2018 13:46:44 -0700 Subject: [PATCH] make: update home page from wiki sidebar properly --- Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 861d69fb7..0d70818b5 100644 --- a/Makefile +++ b/Makefile @@ -970,17 +970,18 @@ site-build: site/hakyll-std/hakyll-std site/manual.md \ $(call def-help,site-build, generate the hledger.org website with hakyll-std ) -cd site; hakyll-std/hakyll-std build -site/docs.md: wiki/_Sidebar.md \ - $(call def-help,site/docs.md, update docs page with wiki sidebar content which should be in ./wiki/_Sidebar ) - (sed -ne '1,// p' site/docs.md ; \ +site/index.md: wiki/_Sidebar.md \ + $(call def-help,site/index.md, update home page with wiki sidebar content which should be in ./wiki/_Sidebar ) + (sed -ne '1,// p' site/index.md ; \ sed -ne '/^#.*User/,$$ p' wiki/_Sidebar.md \ | perl -p \ -e 's/\[\[([^\|]*)\|([^\]]*)\]\]/[\1](https:\/\/github.com\/simonmichael\/hledger\/wiki\/\2)/g;' \ -e 's/\[\[([^\]]*)\]\]/[\1](https:\/\/github.com\/simonmichael\/hledger\/wiki\/\1)/g;' \ + -e 's/^# >/##/;' \ ; \ - sed -ne '//,$$ p' site/docs.md ) \ - > site/_docs.md.$$$$ && \ - mv site/_docs.md.$$$$ site/docs.md + sed -ne '//,$$ p' site/index.md ) \ + > site/_index.md.$$$$ && \ + mv site/_index.md.$$$$ site/index.md site-clean: site/hakyll-std/hakyll-std \ $(call def-help,site-clean, remove hakyll-generated files (& take down the website) ) #cleanolddocs