Merge branch 'main' into test

deploy.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -x
+
 if [ "$1" = "test" ]; then
     branch='test'
     location='/var/www/html-test'
@@ -21,12 +23,12 @@ git clean -f
 git pull
 
 cd ~/dotfiles || exit
-git checkout "$branch"
+git checkout main
 git clean -f
 git pull
 
 cd ~/blog || exit
-git checkout "$branch"
+git checkout main
 git clean -f
 git pull
 
@@ -34,11 +36,13 @@ git pull
 
 cd ~/dotfiles || exit
 ~/website/fix-dotfile-paths.sh
-cd "$HOME"
+cd "$HOME" || exit
 /usr/local/bin/emacs --batch -f package-initialize --script ~/website/publish.el
 ~/website/post-publish.sh
 
 sed -i 's/) <a href=\"blog\//) <a href=\".\//' ~/public_html/blog/index.html
+sed -i 's/<webMaster>.*<\/webMaster>/<webMaster>jjanzen@jjanzen.ca (jjanzen)<\/webMaster>/g' ~/public_html/rss.xml
+sed -i 's/<author>.*<\/author>/<author>jjanzen@jjanzen.ca (jjanzen)<\/author>/g' ~/public_html/rss.xml
 
 /bin/cp -r "$HOME/public_html"/* "$location"
 chown -R apache:apache "$location"

fix-dotfile-paths.sh

@@ -21,7 +21,7 @@ create_ls_entry () {
                 mv "$file" "$tmp"
             fi
             if [ "$file" = ".wallpaper" ]; then
-                echo "- [[https://wallhaven.cc/w/83y8ey][=.wallpaper=]]" >> index.org
+                echo "- [[https://wallhaven.cc/w/n66pex][=.wallpaper=]]" >> index.org
             elif echo "$file" | grep -q "\.org$" && [ "$file" != "index.org" ]; then
                 new_file=$(echo "$file" | sed 's/\.org$//')
                 html=$(echo "$file" | sed 's/\.org$/\.html/')

publish.el

@@ -54,7 +54,7 @@
 :properties:
 :rss_permalink: blog/%s
 :pubdate: %s
-:author: Jacob Janzen
+:author: jjanzen
 :end:\n%s"
             title
             link
@@ -81,7 +81,7 @@
 (defvar jj/html-postamble "\
 <footer>\
   <aside id='cssa-webring-container' class='cssa-webring-container'></aside>\
-  <section class='copyright-notice'>copyright © jjanzen 2024</section>\
+  <section class='copyright-notice'>copyright © jjanzen 2024-2025</section>\
   <script src='/scripts/oneko.js'></script>\
 </footer>")
 
@@ -138,7 +138,7 @@
          :html-link-org-files-as-html t
          :auto-sitemap t
          :sitemap-function posts-rss-feed
-         :sitemap-title "Jacob Janzen's Blog"
+         :sitemap-title "jjanzen's Blog"
          :sitemap-filename "rss.org"
          :sitemap-style list
          :sitemap-sort-files anti-chronologically