New and Improved!

2023-02-08 17:17:45 +00:00 · 2023-02-08 17:17:45 +00:00 · bf8e31dbab
commit bf8e31dbab
parent c9f22bdc3d
17 changed files with 34 additions and 29 deletions
--- a/gensmap.sh
+++ b/gensmap.sh
@ -1,9 +1,8 @@
-function r { echo $@ >> sitemap.xml; }
-pushd ../..
-sed -i d sitemap.xml
+function r { echo $@ >> out/sitemap.xml; }
+test -d out/sitemap.xml && sed -i d sitemap.xml
 r '<?xml version="1.0" encoding="UTF-8"?>'
 r '<urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">'
-for i in `find *`; do
+for i in `find in -type f -name '*.html'`; do
 r "<url>"
 r "<loc>https://atlas48.neocities.org/$i</loc>"
 r "<lastmod>$(date +"%Y-%M-%d" -r $i)</lastmod>"
--- a/in/css/main.css
+++ b/in/css/main.css
--- a/in/dnd/minions.org
+++ b/in/dnd/minions.org
--- a/in/dnd/template.org
+++ b/in/dnd/template.org
--- a/in/dnd/villains.org
+++ b/in/dnd/villains.org
--- a/in/dnd/xaviard.org
+++ b/in/dnd/xaviard.org
--- a/in/img/av.png
+++ b/in/img/av.png
--- a/in/img/ucbanner.gif
+++ b/in/img/ucbanner.gif
--- a/in/index.txti
+++ b/in/index.txti
--- a/in/neocities.png
+++ b/in/neocities.png
--- a/in/not_found.html
+++ b/in/not_found.html
--- a/in/robots.txt
+++ b/in/robots.txt
--- a/main.html.m4
+++ b/main.html.m4
@ -1,6 +1,6 @@
 dnl template.m4.html v1.2
 dnl Part of the tape-and-string suite used to construct the website
-include(LIB)dnl
+include(`lib.m4')dnl
 <!DOCTYPE html>
 <html>
 <head>
--- a/render.sh
+++ b/render.sh
@ -1,7 +1,12 @@
 #!/bin/bash
 # render.sh: part of the tape-and-string framework.
 # v3.0
-. titles.sh
+enable -f /usr/lib/bash/csv csv
+declare -A title
+while read -r ii; do
+  csv -a i "$ii"
+  title[in/${i[0]}]=${i[1]}
+done <title.csv
 function inf { echo -e "\x1B[1;32mINF\x1B[0m: $*"; }
 function wrn { echo -e "\x1B[1;93mWRN\x1B[0m: $*"; }
 function err { echo -e "\x1B[1;31mERR\x1B[0m: $*"; }
@ -30,21 +35,27 @@ function yn {
 	esac
  done
 }
-doc=(`find . -wholename './.hg' -prune , -type f -name '*.txti' -o -name '*.org' -o -name '*.md'`)
-sass=(`find . -wholename './.hg' -prune , -type f -name '*.sass'`)
-scss=(`find . -wholename './.hg' -prune , -type f -name '*.scss'`)
-rest=(`find . -wholename './.hg' -prune , -type f ! \( -name '*.org' -o -name '*.txti' -o -name '*.md' -o -name .hg \)`)
-dir=(`find . -wholename './.hg' -prune , -type d -not -name .hg`)
+doc=(`find in -type f -name '*.txti' -o -name '*.org' -o -name '*.md'`)
+sass=(`find in -type f -name '*.sass'`)
+scss=(`find in -type f -name '*.scss'`)
+rest=(`find in -type f ! \( -name '*.org' -o -name '*.txti' -o -name '*.md' -o -name .hg \)`)
+dir=(`find in -type d`)

 inf "Creating directory structure..."
+echo ${dir[@]}
 for i in ${dir[@]}; do
-  echo $i
-  mkdir -p out/$i
+  o="${i/in/out}"
+  mkdir -pv $o
 done
 inf "Rendering document files..."
 for i in ${doc[@]}; do
-  echo $i
-  tape $i | m4 -DTITLE="${title[$i]}" main.html.m4 > out/${i%.*}.html
+  o="${i/in/out}"
+  echo "$i => $o"
+  if test -z "${title[$i]}"; then
+	tape $i | m4 main.html.m4 > ${o%.*}.html
+  else
+	tape $i | m4 -DTITLE="${title[$i]}" main.html.m4 > ${o%.*}.html
+  fi
 done
 inf "Rendering sass files..."
 if test -z "${sass[@]}"; then
@ -52,8 +63,9 @@ if test -z "${sass[@]}"; then
  unset sass
 else
  for i in ${sass[@]}; do
-	echo $i
-	sassc -a $i out/$i
+	o="${i/in/out}"
+	echo "$i => $o"
+	sassc -a $i $o
  done
 fi
 if test -z "${scss[@]}"; then
@ -61,12 +73,10 @@ if test -z "${scss[@]}"; then
  unset scss
 else
  for i in ${scss[@]}; do
-	echo $i
-	sassc $i out/$i
+	o="${i/in/out}"
+	echo "$i => $o"
+	sassc $i $o
  done
 fi
 inf "Copying other files..."
-# Probably a more efficient way to do this.
-for i in ${rest[@]}; do
-  cp -v $i out/$i
-done
+cp -rv 'in'/* out/
--- a/title.csv
+++ b/title.csv
@ -0,0 +1,2 @@
+index.txti,"Atlas48's Archives"
+not_found.html,"404 - Page Not Found"
--- a/titles.sh
+++ b/titles.sh
@ -1,4 +0,0 @@
-declare -A titles
-titles["not_found.txti"]="404 - Page Not Found"
-titles["index.txti"]="Atlas48's Archives"
-
--- a/titles.tsv
+++ b/titles.tsv
@ -1,2 +0,0 @@
-index.txti	Atlas48's Archives
-not_found.html	404 - Page Not Found