From 096cbcc05d297c1bba3c884e84910a04688b12ad Mon Sep 17 00:00:00 2001 From: /dev/urandom Date: Tue, 18 May 2021 11:55:47 +0300 Subject: [PATCH] linked to text pages on index, added DC mode for text index.html, fixed some errors --- Makefile | 6 +++++- textindex.sh | 17 ++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index dc84ce9..df5fcc0 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ OUT_STATIC = $(patsubst static/%,out/%,$(_STATIC_FILES)) $(patsubst static/%.h,o .SUFFIXES: .PHONY: all upload -all: $(OUTDIR)/blog/index.html $(OUTDIR)/dc/blog/index.html $(OUTDIR)/blog/main.rss $(OUTDIR)/text/index.html $(PAGES_HTML) $(PAGES_HTML_DC) $(TEXT_PAGES_TXT) $(TEXT_PAGES_HTML) $(OUT_STATIC) +all: $(OUTDIR)/blog/index.html $(OUTDIR)/dc/blog/index.html $(OUTDIR)/blog/main.rss $(OUTDIR)/text/index.html $(OUTDIR)/dc/text/index.html $(PAGES_HTML) $(PAGES_HTML_DC) $(TEXT_PAGES_TXT) $(TEXT_PAGES_HTML) $(OUT_STATIC) upload: ./upload.sh @@ -56,6 +56,10 @@ $(OUTDIR)/text/%.txt: $(PAGEDIR)/text/%.txt @mkdir -p $(@D) cp $< $@ +$(OUTDIR)/dc/text/index.html: $(_TEXT_PAGES) + @mkdir -p $(@D) + ./textindex.sh -d | $(THEME) $(DC_THEME_FLAGS) -t $(TPLDIR)/dreamcast.tpl -p text/index.html -o $@ + $(OUTDIR)/text/index.html: $(_TEXT_PAGES) @mkdir -p $(@D) ./textindex.sh | $(THEME) $(THEME_FLAGS) -t $(TPLDIR)/default.tpl -p text/index.html -o $@ diff --git a/textindex.sh b/textindex.sh index 7e00d00..bde5f92 100755 --- a/textindex.sh +++ b/textindex.sh @@ -1,5 +1,15 @@ #!/bin/bash +DCMODE=0 + +while getopts d name +do + case $name in + d) DCMODE=1;; + ?) printf "Usage: %s [-d]\n" $0; exit 1;; + esac +done + DIRECTORY="pages/text" FILES=`ls $DIRECTORY/*.txt -1 | sort` @@ -13,9 +23,14 @@ EOF for f in $FILES; do + f=${f#pages/text/} OUTPAGE=${f%.txt}.html OUTPAGE=${OUTPAGE#pages/text/} - echo " * [$f]($OUTPAGE) ([text](${OUTPAGE%.html}.txt))" + if [ $DCMODE -eq 1 ]; then + echo " * [$f](/text/${OUTPAGE%.html}.txt)" + else + echo " * [$f]($OUTPAGE) ([text](${OUTPAGE%.html}.txt))" + fi done