Merge branch 'main' into test

1 files changed, 7 insertions, 3 deletions

diff --git a/deploy.sh b/deploy.sh
index 5ee9db3..4c0e69e 100755
--- a/deploy.sh
+++ b/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"