wimdupont.com

commit 212a47facb150ccffa9fd0c79ffbbbb882d50d5c
parent bf2ee8ab67dfa8f4cd3b30cf6164583d4d572b23
Author: Wim Dupont <wim@wimdupont.com>
Date:   Sat,  4 Oct 2025 13:13:15 +0200

minor changes

Diffstat:
M
generate.sh
 | 
21
+++++++++++----------
R
content/booklist.csv -> lists/booklist.csv
 | 
0

R
content/links.csv -> lists/links.csv
 | 
0

3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/generate.sh b/generate.sh
@@ -15,8 +15,8 @@ readonly BLOG_REPO_DIR=$HREF_REPO_DIR/blog
 readonly GUIDE_REPO_DIR=$HREF_REPO_DIR/guides
 readonly SOFTWARE_REPO_DIR=$HREF_REPO_DIR/software
 readonly ERROR_REPO_DIR=$PAGES_REPO_DIR/error
-readonly BOOKLIST_FILE=$REPO_PATH/content/booklist.csv
-readonly LINKS_FILE=$REPO_PATH/content/links.csv
+readonly BOOKLIST_FILE=$REPO_PATH/lists/booklist.csv
+readonly LINKS_FILE=$REPO_PATH/lists/links.csv
 readonly HEADER_FILE=$PAGES_REPO_DIR/header.adoc
 readonly FOOTER_FILE=$PAGES_REPO_DIR/footer.adoc
 
@@ -86,11 +86,12 @@ generate_href_page() {
 	local name=$1
 	local ref_dir=$2
 	local with_date=$3
+	declare -r DEST_FILE="${NGINX_DIR}/${name}.adoc"
 
-	cd $ref_dir
-	get_page_header "${name}" > "$NGINX_DIR/$name.adoc"
+	cd "${ref_dir}"
+	get_page_header "${name}" > "${DEST_FILE}"
 
-	test -e $HREF_REPO_DIR/$name.adoc && cat $HREF_REPO_DIR/$name.adoc | sed -e '/\/\/content/,$d' >> "$NGINX_DIR/$name.adoc"
+	test -e $HREF_REPO_DIR/$name.adoc && cat $HREF_REPO_DIR/$name.adoc | sed -e '/\/\/content/,$d' >> "${DEST_FILE}"
 
 	readarray -t files < <(stat -c '%Y %n' * | sort -n -r)
 
@@ -105,10 +106,10 @@ generate_href_page() {
 		echo "* $art_fileref" >> "$NGINX_DIR/$name.adoc"
 	done
 
-	test -e $HREF_REPO_DIR/$name.adoc && cat $HREF_REPO_DIR/$name.adoc | sed -e '1,/\/\/content/d' >> "$NGINX_DIR/$name.adoc"
+	test -e $HREF_REPO_DIR/$name.adoc && cat $HREF_REPO_DIR/$name.adoc | sed -e '1,/\/\/content/d' >> "${DEST_FILE}"
 
-	cd $NGINX_DIR
-	get_page_footer "" >> "$NGINX_DIR/$name.adoc"
+	cd "${NGINX_DIR}"
+	get_page_footer "" >> "${DEST_FILE}"
 	asciidoctor "$name.adoc"
 	rm "$name.adoc"
 }
@@ -125,7 +126,7 @@ generate_error_pages() {
 }
 
 generate_books_page() {
-	declare -r DEST_FILE=/usr/share/nginx/html/books.adoc
+	declare -r DEST_FILE="${NGINX_DIR}/books.adoc"
 
 	get_page_header "Books" > $DEST_FILE
 	echo -e "[.subheader]\nThis is the collection of books of which I own a physical copy\n" >> $DEST_FILE
@@ -155,7 +156,7 @@ generate_books_page() {
 }
 
 generate_links_page() {
-	declare -r DEST_FILE=/usr/share/nginx/html/links.adoc
+	declare -r DEST_FILE="${NGINX_DIR}/links.adoc"
 
 	get_page_header "Links" > $DEST_FILE
 	echo -e "[.subheader]\nLinks to websites on various topics\n" >> $DEST_FILE
diff --git a/content/booklist.csv b/lists/booklist.csv
diff --git a/content/links.csv b/lists/links.csv