diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile | 44 | ||||
| -rw-r--r-- | meta.capim | 5 | ||||
| -rw-r--r-- | meta.json | 5 | ||||
| -rwxr-xr-x | mkdeps.sh | 1 | ||||
| -rw-r--r-- | src/content/favicon.png | bin | 17842 -> 17749 bytes |
6 files changed, 33 insertions, 24 deletions
@@ -18,4 +18,6 @@ *.ps *.pdf *.gz +*.sentinel +*.torrent /src/content/.gitignore @@ -28,7 +28,7 @@ BASEURL = / .SUFFIXES: .SUFFIXES: .adoc .conf .snippets .indexentry .feedentry .mapentry .sortdata .xml .SUFFIXES: .htmlbody .htmlheader .htmlfooter .htmllisting .html .links .caslinks -.SUFFIXES: .txt .categorydata .gz .torrent .flac .ogg .ps .pdf +.SUFFIXES: .txt .categorydata .gz .torrent .flac .ogg .ps .pdf .sentinel .adoc.conf: mkwb conf src/global.conf $< > $@ @@ -125,6 +125,7 @@ dynamic-contents = \ $(sources.html) \ $(slides.pdf) \ $(feeds.xml) \ + $(sources.media.torrent) \ src/content/sitemap.xml \ static-contents = \ @@ -163,6 +164,13 @@ all-contents = \ $(contents) \ $(contents.gz) \ +captured-assets = \ + src/content/$(PUBURL) \ + src/content/favicon.ico \ + src/content/favicon.png \ + +captured-assets.sentinel = $(captured-assets:=.sentinel) + derived-assets = \ $(dynamic-contents) \ @@ -209,12 +217,7 @@ derived-assets = \ install.txt \ sources.txt \ src/content/.gitignore \ - -captured-assets = \ - src/content/$(PUBURL) \ - src/content/favicon.ico \ - src/content/favicon.png \ - $(sources.media.torrent) \ + $(captured-assets.sentinel) \ side-assets = \ src/collections/*/*/*/*/*/*.html.*.txt \ @@ -287,16 +290,19 @@ $(sources.snippets.gz) $(categories.xml.gz): if [ -s $* ]; then gzip -9fk `cat $*`; fi sed 's/$$/.gz/' $* > $@ -src/content/$(PUBURL).gz: src/content/$(PUBURL) -src/content/$(PUBURL): - gpg --export --armour "`jq -r '.email' < meta.json`" > $@ +src/content/$(PUBURL).gz: src/content/$(PUBURL).sentinel +src/content/$(PUBURL).sentinel: email.txt + gpg --export --armour "`cat email.txt`" | ifnew $* + touch $@ -src/content/favicon.ico.gz: src/content/favicon.ico -src/content/favicon.ico: src/content/img/favicon.svg - convert src/content/img/favicon.svg $@ +src/content/favicon.ico.gz: src/content/favicon.ico.sentinel +src/content/favicon.ico.sentinel: src/content/img/favicon.svg + convert src/content/img/favicon.svg -strip ico:- | ifnew $* + touch $@ -src/content/favicon.png: src/content/img/favicon.svg - convert src/content/img/favicon.svg $@ +src/content/favicon.png.sentinel: src/content/img/favicon.svg + convert src/content/img/favicon.svg -strip png:- | ifnew $* + touch $@ $(sources.media.torrent): F="`printf '%s\n' $* | cut -d/ -f3-`" && \ @@ -306,11 +312,11 @@ src/content/sitemap.xml.gz: src/content/sitemap.xml src/content/sitemap.xml: $(sources.mapentry) mkwb sitemap $(sources.mapentry) > $@ -email.txt: meta.json - jq -r '.email' < meta.json > $@ +email.txt: meta.capim + cat meta.capim | awk '$$1 == ":email" && $$0=$$2' | tr -d '"' > $@ -baseurl.txt: meta.json - jq -r '.baseurl' < meta.json > $@ +baseurl.txt: meta.capim + cat meta.capim | awk '$$1 == ":baseurl" && $$0=$$2' | tr -d '"' > $@ fingerprint.txt: src/content/$(PUBURL) gpg --always-trust --no-keyring --show-key --with-colons \ diff --git a/meta.capim b/meta.capim new file mode 100644 index 0000000..ba9dd94 --- /dev/null +++ b/meta.capim @@ -0,0 +1,5 @@ +{ + :description "Landing page for Papo website (papo.im)." + :baseurl "https://papo.im" + :email "support@papo.im" +} diff --git a/meta.json b/meta.json deleted file mode 100644 index 7a1638f..0000000 --- a/meta.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "description": "Landing page for Papo website (papo.im).", - "baseurl": "https://papo.im", - "email": "support@papo.im" -} @@ -77,6 +77,7 @@ find po/*.po po/*.pot | varlist 'sources.po' files | sed 's/^\(.*\)\.adoc$/\1.snippets/' slides | sed 's/^\(.*\)\.adoc$/\1.pdf/' indexes | sed 's|^\(.*\)/index\.adoc$|\1/feed.xml|' + media | sed 's/^\(.*\)$/\1.torrent/' } | sed 's/^\(.*\)$/\1.gz:\t\1/' printf '\n' diff --git a/src/content/favicon.png b/src/content/favicon.png Binary files differindex fdc9d9b..39a556a 100644 --- a/src/content/favicon.png +++ b/src/content/favicon.png |
