diff options
| -rw-r--r-- | txt/books.txt | 1 | ||||
| -rw-r--r-- | www/causal.agency/Makefile | 2 | ||||
| -rw-r--r-- | www/causal.agency/dais.html | 11 | ||||
| -rw-r--r-- | www/photo.causal.agency/gear.html | 13 | ||||
| -rw-r--r-- | www/they.causal.agency/Makefile | 4 | ||||
| -rw-r--r-- | www/they.causal.agency/post-update.sh | 39 |
6 files changed, 64 insertions, 6 deletions
diff --git a/txt/books.txt b/txt/books.txt index a096a2f4..d8166d72 100644 --- a/txt/books.txt +++ b/txt/books.txt @@ -1,5 +1,6 @@ [ 2025 ] + 5. ★★★ Alix E. Harrow, The Everlasting 4. ★★☆ Arkady Martine, Rose/House 3. ★★☆ H. E., second draft of Last Train Home 2. ★★☆ Nicola Griffith, Spear diff --git a/www/causal.agency/Makefile b/www/causal.agency/Makefile index 8c74f8f1..d3af7265 100644 --- a/www/causal.agency/Makefile +++ b/www/causal.agency/Makefile @@ -1,7 +1,7 @@ WEBROOT = /var/www/causal.agency GEN = index.html scheme.css scheme.png -FILES = ${GEN} style.css alpha.html lands.html +FILES = ${GEN} style.css alpha.html dais.html lands.html all: ${FILES} diff --git a/www/causal.agency/dais.html b/www/causal.agency/dais.html new file mode 100644 index 00000000..109654d3 --- /dev/null +++ b/www/causal.agency/dais.html @@ -0,0 +1,11 @@ +<!DOCTYPE html> +<title>Dais</title> +<meta charset="utf-8"> +<style> +body { line-height: 1.5em; max-width: 78ch; margin: auto; padding: 0.5em 1ch; } +</style> + +<h1>First occurrences of the word “dais”</h1> +<ol> +<li>A. K. Larkwood, The Unspoken Name: p. 19 +</ol> diff --git a/www/photo.causal.agency/gear.html b/www/photo.causal.agency/gear.html index e058d341..04cd3781 100644 --- a/www/photo.causal.agency/gear.html +++ b/www/photo.causal.agency/gear.html @@ -14,10 +14,12 @@ this is a (probably incomplete) list of equipment I use to Do Photography. <h2>Cameras</h2> <ul> <li>Yashica FX-3 (every day) -<li>Konica C35 Automatic (Hexanon 38mm f/2.8) (every day) -<li>Praktica MTL3 (probably on loan to a friend) +<li>Konica C35 Automatic (Hexanon 38mm f/2.8) +<li>Minolta XE-5 +<li>Praktica MTL3 <li>Zenit-122 <li>Yashica FX-2 +<li>Yashica-D (Yashikor 80mm f/3.5) </ul> <h2>Lenses</h2> @@ -26,6 +28,7 @@ this is a (probably incomplete) list of equipment I use to Do Photography. <li>Yashica DSB 50mm f/1.9 (FX-2 kit lens) <li>Helios-44M-5 58mm f/2 (Zenit-122 kit lens) <li>Pentacon 50mm f/1.8 (MTL3 kit lens) +<li>Minolta MD Rokkor-X 50mm f/1.7 (XE-5 kit lens) <li>Osawa MC 70-210mm f/4-5 (C/Y) <li>Takumar SMC 35mm f/3.5 <li>Super-Takumar 135mm f/3.5 @@ -54,12 +57,12 @@ this is a (probably incomplete) list of equipment I use to Do Photography. <h2>Scanning</h2> <ul> <li>Filmomat SmartConvert -<li>Canon EOS Rebel SL3 +<li>Fujifilm X-T5 <li>Yashica ML Macro 55mm f/2.8 (at f/11) <li>Yashica 13mm extension tube (also have 20mm and 27mm) -<li>Urth C/Y-EF adapter +<li>Urth C/Y-X adapter <li>Skier CS-700 copy stand -<li>Valoi 135 film holder +<li>Valoi 135 & 120 film holders <li>CineStill CS-Lite <li>the box the CS-Lite came in </ul> diff --git a/www/they.causal.agency/Makefile b/www/they.causal.agency/Makefile new file mode 100644 index 00000000..81f47ea9 --- /dev/null +++ b/www/they.causal.agency/Makefile @@ -0,0 +1,4 @@ +ROOT = /var/www/man + +install: post-update.sh + install post-update.sh ${ROOT}/post-update diff --git a/www/they.causal.agency/post-update.sh b/www/they.causal.agency/post-update.sh new file mode 100644 index 00000000..2c0e6f54 --- /dev/null +++ b/www/they.causal.agency/post-update.sh @@ -0,0 +1,39 @@ +#!/bin/sh +set -eu + +do_tree() { + tree=$1 + manpath=$2 + echo "Copying manuals for ${tree}..." + git ls-tree $tree | while read -r mode type hash name; do + if [ $type != blob ]; then + continue + fi + case "$name" in + (README.7) + continue + ;; + (*.[1-9]) + section=${name##*.} + mkdir -p /var/www/man/${manpath}/man${section} + git cat-file $type $hash \ + >/var/www/man/${manpath}/man${section}/${name} + esac + done + if test -d /var/www/man/${manpath}; then + makewhatis /var/www/man/${manpath} + if ! fgrep -q ${manpath} /var/www/man/manpath.conf; then + echo $manpath >>/var/www/man/manpath.conf + fi + fi +} + +do_tree HEAD HEAD + +repo=${PWD##*/} +for tag in $(git tag); do + manpath=${repo%.git}-${tag} + if ! test -d /var/www/man/${manpath}; then + do_tree $tag $manpath + fi +done |