libreboot

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README

commit 6d14a76d3241f8ef0b41f11bb6d9a89d6371b48b
parent 33994555b10253359c135d326a5cd36813b1db08
Author: Leah Rowe <info@minifree.org>
Date:   Tue, 11 Jul 2017 01:37:14 +0000

Merge branch 'fix-index-sh' of mreed/libreboot into master

Diffstat:
www/Makefile | 2+-
www/index.sh | 4++--
www/news/MANIFEST | 5+++++
3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/www/Makefile b/www/Makefile @@ -16,7 +16,7 @@ MD_MAIN != find -L . -name '*.md' -and ! -path '*/news/*' HTML_MAIN = $(MD_MAIN:.md=.html) -MD_NEWS != find -L news -name '*.md' -and ! -name index.md +MD_NEWS != cat news/MANIFEST HTML_NEWS = $(MD_NEWS:.md=.html) diff --git a/www/index.sh b/www/index.sh @@ -37,13 +37,13 @@ meta() { # generate the index file -FILES=$(ls -1 -t news/*.md | sed -e s-.*index.md-- -e s-.*presentation.md--) +# MANIFEST determines the order of news articles in news/index.md +FILES=$(cat news/MANIFEST) cat news-list.md > news/index.md for f in $FILES do - touch -d "$(sed -n 3p $f | sed -e 's/^..//g')" $f meta >> news/index.md done diff --git a/www/news/MANIFEST b/www/news/MANIFEST @@ -0,0 +1,5 @@ +news/new-mailing-lists.md +news/andrew-robbins-new-maintainer.md +news/formalised-structure.md +news/proposal-rejoin-gnu.md +news/unity.md