jjanzen/website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into test

Browse source
This commit is contained in:
jjanzen 2025-02-10 17:18:55 -06:00
commit fe329badb9
5 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
deploy.sh
View file

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

2
fix-dotfile-paths.sh
View file

@ -21,7 +21,7 @@ create_ls_entry () {
mv "$file" "$tmp" mv "$file" "$tmp"
fi fi
if [ "$file" = ".wallpaper" ]; then 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 elif echo "$file" | grep -q "\.org$" && [ "$file" != "index.org" ]; then
new_file=$(echo "$file" | sed 's/\.org$//') new_file=$(echo "$file" | sed 's/\.org$//')
html=$(echo "$file" | sed 's/\.org$/\.html/') html=$(echo "$file" | sed 's/\.org$/\.html/')

BIN
images/false-boar.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 880 KiB

BIN
images/true-boar.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1,006 KiB

6
publish.el
View file

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