From 8615ee326258669a253e478476d2b8dfda0c4263 Mon Sep 17 00:00:00 2001 From: Jacob Janzen Date: Sun, 5 Jan 2025 19:40:49 -0600 Subject: update copyright --- publish.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/publish.el b/publish.el index bc64d75..397642f 100644 --- a/publish.el +++ b/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 "\ ") @@ -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 -- cgit v1.2.3 From 27757ce591907a47b1f36183cc2116c2a4a59d1d Mon Sep 17 00:00:00 2001 From: Jacob Janzen Date: Sun, 5 Jan 2025 19:46:25 -0600 Subject: update deploy --- deploy.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/deploy.sh b/deploy.sh index 5ee9db3..f9ca634 100755 --- a/deploy.sh +++ b/deploy.sh @@ -39,6 +39,7 @@ cd "$HOME" ~/website/post-publish.sh sed -i 's/) .*/jjanzen@jjanzen.ca (jjanzen)' ~/public_html/rss.xml /bin/cp -r "$HOME/public_html"/* "$location" chown -R apache:apache "$location" -- cgit v1.2.3 From 270eb5d124fcb6105a963e024169ca965739d25e Mon Sep 17 00:00:00 2001 From: Jacob Janzen Date: Sun, 5 Jan 2025 19:48:52 -0600 Subject: echo commands --- deploy.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deploy.sh b/deploy.sh index f9ca634..0771010 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' -- cgit v1.2.3 From 3614f3ae19185d72e18b351459df97b07570c9b0 Mon Sep 17 00:00:00 2001 From: Jacob Janzen Date: Sun, 5 Jan 2025 19:50:01 -0600 Subject: fix sed syntax --- deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.sh b/deploy.sh index 0771010..4d52047 100755 --- a/deploy.sh +++ b/deploy.sh @@ -41,7 +41,7 @@ cd "$HOME" ~/website/post-publish.sh sed -i 's/) .*/jjanzen@jjanzen.ca (jjanzen)' ~/public_html/rss.xml +sed -i 's/.*/jjanzen@jjanzen.ca (jjanzen)/g' ~/public_html/rss.xml /bin/cp -r "$HOME/public_html"/* "$location" chown -R apache:apache "$location" -- cgit v1.2.3 From 33e40a56dc9a8b596972e1a06bb7aad7ec56c637 Mon Sep 17 00:00:00 2001 From: Jacob Janzen Date: Sun, 5 Jan 2025 19:53:01 -0600 Subject: fix sed syntax --- deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.sh b/deploy.sh index 4d52047..6c94294 100755 --- a/deploy.sh +++ b/deploy.sh @@ -41,7 +41,7 @@ cd "$HOME" ~/website/post-publish.sh sed -i 's/) .*/jjanzen@jjanzen.ca (jjanzen)/g' ~/public_html/rss.xml +sed -i 's/.*<\/webMaster>/jjanzen@jjanzen.ca (jjanzen)<\/webMaster>/g' ~/public_html/rss.xml /bin/cp -r "$HOME/public_html"/* "$location" chown -R apache:apache "$location" -- cgit v1.2.3 From 2140698d15c67d6e3ccc9fb3bf85bb9486fe899f Mon Sep 17 00:00:00 2001 From: Jacob Janzen Date: Sun, 5 Jan 2025 19:55:16 -0600 Subject: fix author --- deploy.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/deploy.sh b/deploy.sh index 6c94294..e5fc4e2 100755 --- a/deploy.sh +++ b/deploy.sh @@ -42,6 +42,7 @@ cd "$HOME" sed -i 's/) .*<\/webMaster>/jjanzen@jjanzen.ca (jjanzen)<\/webMaster>/g' ~/public_html/rss.xml +sed -i 's/.*<\/author>/jjanzen@jjanzen.ca (jjanzen)<\/author>/g' ~/public_html/rss.xml /bin/cp -r "$HOME/public_html"/* "$location" chown -R apache:apache "$location" -- cgit v1.2.3 From b1d1155f4fc66d019bcde29e01c291180fb3b2df Mon Sep 17 00:00:00 2001 From: jjanzen Date: Sun, 5 Jan 2025 20:35:09 -0600 Subject: update branch --- deploy.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy.sh b/deploy.sh index e5fc4e2..4c0e69e 100755 --- a/deploy.sh +++ b/deploy.sh @@ -23,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 @@ -36,7 +36,7 @@ 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 -- cgit v1.2.3 From 3e5d23cf2356417981dee66774e9cdcc7458799e Mon Sep 17 00:00:00 2001 From: jjanzen Date: Mon, 6 Jan 2025 12:37:01 -0600 Subject: remove build.yml --- .build.yml | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 .build.yml diff --git a/.build.yml b/.build.yml deleted file mode 100644 index 5d4b2e9..0000000 --- a/.build.yml +++ /dev/null @@ -1,20 +0,0 @@ -image: archlinux -oauth: pages.sr.ht/PAGES:RW -packages: - - emacs - - hut -sources: - - https://git.sr.ht/~jjanzen/.dotfiles - - https://git.sr.ht/~jjanzen/blog -tasks: - - build: | - cd ~/.dotfiles - ~/website/fix-dotfile-paths.sh - emacs --batch -f package-initialize --script ~/website/publish.el - ~/website/post-publish.sh - - package: | - cd ~/public_html/ - tar -cvz . > ../site.tar.gz - - upload: | - hut pages publish -d jjanzen.ca site.tar.gz - hut pages publish -d www.jjanzen.ca site.tar.gz -- cgit v1.2.3 From 3f91d029010684e4e7f8f345374a5cc6ed30538b Mon Sep 17 00:00:00 2001 From: jjanzen Date: Tue, 7 Jan 2025 23:39:42 -0600 Subject: update wallpaper --- fix-dotfile-paths.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fix-dotfile-paths.sh b/fix-dotfile-paths.sh index 1ce5147..f804271 100755 --- a/fix-dotfile-paths.sh +++ b/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/') -- cgit v1.2.3 From 16920ce482c299951477d658e08149975b21ff0d Mon Sep 17 00:00:00 2001 From: jjanzen Date: Fri, 17 Jan 2025 00:12:36 -0600 Subject: add boars --- images/false-boar.png | Bin 0 -> 901657 bytes images/true-boar.png | Bin 0 -> 1030078 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 images/false-boar.png create mode 100644 images/true-boar.png diff --git a/images/false-boar.png b/images/false-boar.png new file mode 100644 index 0000000..9293e44 Binary files /dev/null and b/images/false-boar.png differ diff --git a/images/true-boar.png b/images/true-boar.png new file mode 100644 index 0000000..15ad18a Binary files /dev/null and b/images/true-boar.png differ -- cgit v1.2.3