Commit Diff

Commit:
1d280856feae01dc135cdbb28bfa681ad7d6a63e
From:
Bradley Taunt <bt@btxx.org>
Date:
Message:
Update RSS structure, testing check for operating system
Actions:
Patch | Tree
commit - 7b2dc83a3a3b2da494e1b1370e3ecac94a9c9342
commit + 1d280856feae01dc135cdbb28bfa681ad7d6a63e
blob - 528dece9f4230bf4c58306281343e2df56f58ee6
blob + a88f32af414f2b137a05457baad5139062005581
--- barf
+++ barf
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+domain="https://barf.btxx.org"
+
 # Check the operating system
 os_name=$(uname -s)
 
@@ -48,7 +50,6 @@ index_html() {
 
 atom_xml() {
 	uri=$(sed -rn '/atom.xml/ s/.*href="([^"]*)".*/\1/ p' header.html)
-	domain=$(echo "$uri" | sed 's/atom.xml//g' | sed 's|/[^/]*$||')
 	first_commit_date=$(git log --pretty='format:%ai' . | cut -d ' ' -f1 | tail -1)
 
 	cat <<EOF
@@ -87,7 +88,6 @@ EOF
 
 rss_xml() {
 	uri=$(sed -rn '/rss.xml/ s/.*href="([^"]*)".*/\1/ p' header.html)
-	domain=$(echo "$uri" | sed 's/rss.xml//g' | sed 's|/[^/]*$||')
 	first_commit_date=$(git log --pretty='format:%ai' . | cut -d ' ' -f1 | tail -1)
 
 	cat <<EOF
@@ -112,7 +112,7 @@ EOF
 		cat <<EOF
 		<item>
 			<title>$title</title>
-			<description><![CDATA[$content]]></description>
+			<description>$content</description>
 			<link>$domain/$post_link</link>
 			<guid isPermaLink="false">$domain/$post_link</guid>
 			<pubDate>$published_date</pubDate>
blob - be0489e4b68419b4d9eb61df5280493532884581
blob + fac6c4101b9609e8a8518a7be26753ba1a206a38
--- build/about/index.html
+++ build/about/index.html
@@ -5,7 +5,8 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="icon" href="data:,">
 	<title>About `barf`</title>
-	<link href="https://barf.btxx.org/atom.xml" type="application/atom+xml" rel="alternate" title="Atom feed for blog posts" />
+	<link href="/atom.xml" type="application/atom+xml" rel="alternate" title="Atom feed for blog posts" />
+	<link href="/rss.xml" type="application/rss+xml" rel="alternate" title="RSS feed for blog posts" />
 	<style>*{box-sizing:border-box;}body{font-family:sans-serif;margin:0 auto;max-width:650px;padding:1rem;}img{max-width:100%;}pre{overflow:auto;}</style>
 </head>
 
blob - dfe09d269a362e9885408892bee186318c28343f
blob + dfdebe18354097f6495a57e13365740edaaeae9d
--- build/atom.xml
+++ build/atom.xml
@@ -2,7 +2,7 @@
 <feed xmlns="http://www.w3.org/2005/Atom">
 	<title>barf</title>
 	<link href="https://barf.btxx.org/atom.xml" rel="self" />
-	<updated>2024-06-06T08:34:47Z</updated>
+	<updated>2024-06-06T08:48:45Z</updated>
 	<author>
 		<name>Bradley Taunt</name>
 	</author>
blob - 16b767272319e0ab21783598225fbbb0ec71bc4f
blob + 4c24c2084e5b3f2e916d8118b1b92ba0eb1dac58
--- build/cleanup/index.html
+++ build/cleanup/index.html
@@ -5,7 +5,8 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="icon" href="data:,">
 	<title>Cleaning Up barf's Structure</title>
-	<link href="https://barf.btxx.org/atom.xml" type="application/atom+xml" rel="alternate" title="Atom feed for blog posts" />
+	<link href="/atom.xml" type="application/atom+xml" rel="alternate" title="Atom feed for blog posts" />
+	<link href="/rss.xml" type="application/rss+xml" rel="alternate" title="RSS feed for blog posts" />
 	<style>*{box-sizing:border-box;}body{font-family:sans-serif;margin:0 auto;max-width:650px;padding:1rem;}img{max-width:100%;}pre{overflow:auto;}</style>
 </head>
 
blob - a5aaf194bb430df65038274c03e5e88fdf287003
blob + 1c2ecd51f663cbbc7b2a4c52681c1d023139756a
--- build/dark-mode/index.html
+++ build/dark-mode/index.html
@@ -5,7 +5,8 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="icon" href="data:,">
 	<title>Supporting Basic Dark Mode</title>
-	<link href="https://barf.btxx.org/atom.xml" type="application/atom+xml" rel="alternate" title="Atom feed for blog posts" />
+	<link href="/atom.xml" type="application/atom+xml" rel="alternate" title="Atom feed for blog posts" />
+	<link href="/rss.xml" type="application/rss+xml" rel="alternate" title="RSS feed for blog posts" />
 	<style>*{box-sizing:border-box;}body{font-family:sans-serif;margin:0 auto;max-width:650px;padding:1rem;}img{max-width:100%;}pre{overflow:auto;}</style>
 </head>
 
blob - b47b9afed0e87ea5b53ed50ad20600b27aee078c
blob + 6786dc832b9caaec49dc655e8127db7bd5040c57
--- build/index.html
+++ build/index.html
@@ -5,7 +5,8 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="icon" href="data:,">
 	<title>barf</title>
-	<link href="https://barf.btxx.org/atom.xml" type="application/atom+xml" rel="alternate" title="Atom feed for blog posts" />
+	<link href="/atom.xml" type="application/atom+xml" rel="alternate" title="Atom feed for blog posts" />
+	<link href="/rss.xml" type="application/rss+xml" rel="alternate" title="RSS feed for blog posts" />
 	<style>*{box-sizing:border-box;}body{font-family:sans-serif;margin:0 auto;max-width:650px;padding:1rem;}img{max-width:100%;}pre{overflow:auto;}</style>
 </head>
 
blob - f3d1d742aa041f550caef4aa345b3300a20d72c6
blob + 02464e5d67342c0791498a2083d7970f61022309
--- build/macos/index.html
+++ build/macos/index.html
@@ -5,7 +5,8 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="icon" href="data:,">
 	<title>Running `barf` on MacOS</title>
-	<link href="https://barf.btxx.org/atom.xml" type="application/atom+xml" rel="alternate" title="Atom feed for blog posts" />
+	<link href="/atom.xml" type="application/atom+xml" rel="alternate" title="Atom feed for blog posts" />
+	<link href="/rss.xml" type="application/rss+xml" rel="alternate" title="RSS feed for blog posts" />
 	<style>*{box-sizing:border-box;}body{font-family:sans-serif;margin:0 auto;max-width:650px;padding:1rem;}img{max-width:100%;}pre{overflow:auto;}</style>
 </head>
 
blob - 043a664898b0bc7197a1ca0a0efb1b553f75f62c
blob + 1e288019b6d0fd6ea18ffd3dfa92fceecc72be05
--- build/markdown-examples/index.html
+++ build/markdown-examples/index.html
@@ -5,7 +5,8 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="icon" href="data:,">
 	<title>Markdown Examples in barf</title>
-	<link href="https://barf.btxx.org/atom.xml" type="application/atom+xml" rel="alternate" title="Atom feed for blog posts" />
+	<link href="/atom.xml" type="application/atom+xml" rel="alternate" title="Atom feed for blog posts" />
+	<link href="/rss.xml" type="application/rss+xml" rel="alternate" title="RSS feed for blog posts" />
 	<style>*{box-sizing:border-box;}body{font-family:sans-serif;margin:0 auto;max-width:650px;padding:1rem;}img{max-width:100%;}pre{overflow:auto;}</style>
 </head>
 
blob - 7d75ce1055cee36304ce9d58807793d9e9a7e228
blob + 1b80e587a0fb9f426c2ab93b05a746a59d767e8e
--- build/openbsd/index.html
+++ build/openbsd/index.html
@@ -5,7 +5,8 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="icon" href="data:,">
 	<title>Running `barf` on OpenBSD</title>
-	<link href="https://barf.btxx.org/atom.xml" type="application/atom+xml" rel="alternate" title="Atom feed for blog posts" />
+	<link href="/atom.xml" type="application/atom+xml" rel="alternate" title="Atom feed for blog posts" />
+	<link href="/rss.xml" type="application/rss+xml" rel="alternate" title="RSS feed for blog posts" />
 	<style>*{box-sizing:border-box;}body{font-family:sans-serif;margin:0 auto;max-width:650px;padding:1rem;}img{max-width:100%;}pre{overflow:auto;}</style>
 </head>
 
blob - 065e51d13e78a45a4f9807746cd426ed1789826a
blob + 52220d3d03bc890f7b3e4dd33422efe9b9bbcc49
--- build/rss.xml
+++ build/rss.xml
@@ -2,15 +2,15 @@
 <rss version="2.0">
 	<channel>
 		<title>barf</title>
-		<link>/rss.xml</link>
+		<link>https://barf.btxx.org/rss.xml</link>
 		<description>Feed description here</description>
-		<lastBuildDate>Thu, 06 Jun 2024 12:34:47 +0000</lastBuildDate>
-		<pubDate>Thu, 06 Jun 2024 12:34:47 +0000</pubDate>
+		<lastBuildDate>Thu, 06 Jun 2024 12:48:45 +0000</lastBuildDate>
+		<pubDate>Thu, 06 Jun 2024 12:48:45 +0000</pubDate>
 		<generator>Custom RSS Generator</generator>
 		<ttl>1800</ttl>
 		<item>
 			<title>Running `barf` on OpenBSD</title>
-			<description><![CDATA[&lt;h1&gt;Running &lt;code&gt;barf&lt;/code&gt; on OpenBSD&lt;/h1&gt;
+			<description>&lt;h1&gt;Running &lt;code&gt;barf&lt;/code&gt; on OpenBSD&lt;/h1&gt;
 &lt;p&gt;2023-08-12&lt;/p&gt;
 &lt;p&gt;The &lt;code&gt;barf&lt;/code&gt; project was built on Linux and was catered towards Linux users. The core of the project will remain focused on Linux/GNU tools, but I also need to support OpenBSD since that is my personal operating system of choice.&lt;/p&gt;
 &lt;h2&gt;Download Packages&lt;/h2&gt;
@@ -18,14 +18,14 @@
 &lt;pre&gt;&lt;code&gt;doas pkg_add rsync coreutils gsed cmake gcc
 &lt;/code&gt;&lt;/pre&gt;
 &lt;p&gt;Then ensure that you alter all instances of &lt;code&gt;sed&lt;/code&gt; with &lt;code&gt;gsed&lt;/code&gt; in the core &lt;code&gt;barf&lt;/code&gt; file. (Or make an alias if you&#39;d prefer not to alter the main file)&lt;/p&gt;
-&lt;p&gt;After that, everything should work perfectly fine when building!&lt;/p&gt;]]></description>
-			<link>/openbsd</link>
-			<guid isPermaLink="false">/openbsd</guid>
+&lt;p&gt;After that, everything should work perfectly fine when building!&lt;/p&gt;</description>
+			<link>https://barf.btxx.org/openbsd</link>
+			<guid isPermaLink="false">https://barf.btxx.org/openbsd</guid>
 			<pubDate>Sat, 12 Aug 2023 00:00:00 +0000</pubDate>
 		</item>
 		<item>
 			<title>Markdown Examples in barf</title>
-			<description><![CDATA[&lt;h1&gt;Markdown Examples in barf&lt;/h1&gt;
+			<description>&lt;h1&gt;Markdown Examples in barf&lt;/h1&gt;
 &lt;p&gt;2023-01-05&lt;/p&gt;
 &lt;p&gt;This following was lifted from &lt;a href=&quot;https://github.com/karlb/smu&quot;&gt;https://github.com/karlb/smu&lt;/a&gt;&lt;/p&gt;
 &lt;h1&gt;&lt;code&gt;smu&lt;/code&gt; Syntax&lt;/h1&gt;
@@ -257,14 +257,14 @@ one.
 passed through to the resulting document without modification. This is a good
 way to work around features that are missing in smu. If you don&#39;t want this
 behaviour, use the &lt;code&gt;-n&lt;/code&gt; flag when executing smu to stricly escape the HTML
-tags.&lt;/p&gt;]]></description>
-			<link>/markdown-examples</link>
-			<guid isPermaLink="false">/markdown-examples</guid>
+tags.&lt;/p&gt;</description>
+			<link>https://barf.btxx.org/markdown-examples</link>
+			<guid isPermaLink="false">https://barf.btxx.org/markdown-examples</guid>
 			<pubDate>Thu, 05 Jan 2023 00:00:00 +0000</pubDate>
 		</item>
 		<item>
 			<title>Running `barf` on MacOS</title>
-			<description><![CDATA[&lt;h1&gt;Running &lt;code&gt;barf&lt;/code&gt; on MacOS&lt;/h1&gt;
+			<description>&lt;h1&gt;Running &lt;code&gt;barf&lt;/code&gt; on MacOS&lt;/h1&gt;
 &lt;p&gt;2023-01-18&lt;/p&gt;
 &lt;p&gt;The &lt;code&gt;barf&lt;/code&gt; project was built on Linux and was catered towards Linux users. The core of the project will remain focused on Linux/GNU tools, but that doesn&#39;t mean MacOS needs to be left out in the cold.&lt;/p&gt;
 &lt;p&gt;There are some very minor changes you&#39;ll need to make to your default &lt;code&gt;sed&lt;/code&gt; and &lt;code&gt;date&lt;/code&gt; paths if you plan to run barf on MacOS.&lt;/p&gt;
@@ -282,14 +282,14 @@ sudo ln -fs /opt/homebrew/bin/gdate /usr/local/bin/dat
 &lt;p&gt;and add the following to your &lt;code&gt;.bash_profile&lt;/code&gt; file:&lt;/p&gt;
 &lt;pre&gt;&lt;code&gt;export PATH=&amp;quot;/usr/local/bin:$PATH&amp;quot;
 &lt;/code&gt;&lt;/pre&gt;
-&lt;p&gt;Reload your &lt;code&gt;bash&lt;/code&gt; instance and everything should work as intended!&lt;/p&gt;]]></description>
-			<link>/macos</link>
-			<guid isPermaLink="false">/macos</guid>
+&lt;p&gt;Reload your &lt;code&gt;bash&lt;/code&gt; instance and everything should work as intended!&lt;/p&gt;</description>
+			<link>https://barf.btxx.org/macos</link>
+			<guid isPermaLink="false">https://barf.btxx.org/macos</guid>
 			<pubDate>Wed, 18 Jan 2023 00:00:00 +0000</pubDate>
 		</item>
 		<item>
 			<title>Supporting Basic Dark Mode</title>
-			<description><![CDATA[&lt;h1&gt;Supporting Basic Dark Mode&lt;/h1&gt;
+			<description>&lt;h1&gt;Supporting Basic Dark Mode&lt;/h1&gt;
 &lt;p&gt;2023-03-07&lt;/p&gt;
 &lt;p&gt;The default &lt;code&gt;barf&lt;/code&gt; site generator now supports basic dark mode functionality. This has been achieved by including the standard &lt;code&gt;color-scheme&lt;/code&gt; meta tag in the core &lt;code&gt;header.html&lt;/code&gt; file:&lt;/p&gt;
 &lt;pre&gt;&lt;code&gt;&amp;lt;meta name=&amp;quot;color-scheme&amp;quot; content=&amp;quot;dark light&amp;quot;&amp;gt;
@@ -299,14 +299,14 @@ sudo ln -fs /opt/homebrew/bin/gdate /usr/local/bin/dat
 &lt;/blockquote&gt;
 &lt;h2&gt;Minor Caveat&lt;/h2&gt;
 &lt;p&gt;Unfortunately, Safari still has minor &lt;code&gt;ahref&lt;/code&gt; / link color issue when defaulting to browser dark mode. If this is a problem for your own build of &lt;code&gt;barf&lt;/code&gt;, take a look at a &lt;a href=&quot;https://bt.ht/safari-default-dark-mode/&quot;&gt;solution I wrote about here&lt;/a&gt;.&lt;/p&gt;
-&lt;p&gt;Personally, I can&#39;t be bothered to add that extra code to this project. The Safari team needs to get their shit together and fix such a simple bug. Plus, you shouldn&#39;t be using Safari anyway - it&#39;s proprietary garbage.&lt;/p&gt;]]></description>
-			<link>/dark-mode</link>
-			<guid isPermaLink="false">/dark-mode</guid>
+&lt;p&gt;Personally, I can&#39;t be bothered to add that extra code to this project. The Safari team needs to get their shit together and fix such a simple bug. Plus, you shouldn&#39;t be using Safari anyway - it&#39;s proprietary garbage.&lt;/p&gt;</description>
+			<link>https://barf.btxx.org/dark-mode</link>
+			<guid isPermaLink="false">https://barf.btxx.org/dark-mode</guid>
 			<pubDate>Tue, 07 Mar 2023 00:00:00 +0000</pubDate>
 		</item>
 		<item>
 			<title>Cleaning Up barf's Structure</title>
-			<description><![CDATA[&lt;h1&gt;Cleaning Up barf&#39;s Structure&lt;/h1&gt;
+			<description>&lt;h1&gt;Cleaning Up barf&#39;s Structure&lt;/h1&gt;
 &lt;p&gt;2023-10-09&lt;/p&gt;
 &lt;p&gt;Things probably look a little different around here. Both in terms of this demo site &lt;em&gt;and&lt;/em&gt; the core &lt;code&gt;barf&lt;/code&gt; files itself.&lt;/p&gt;
 &lt;p&gt;This project was always intended to be focused on Linux platforms. So, I&#39;ve removed the included &lt;code&gt;barf_macos&lt;/code&gt; and &lt;code&gt;barf_openbsd&lt;/code&gt; files to keep the generator more streamlined. But have no fear! Instructions for both Mac and OpenBSD can still be found on the main blog:&lt;/p&gt;
@@ -323,9 +323,9 @@ pre{overflow:auto;}
 &lt;p&gt;Users still have the ability to tweak things as much as they&#39;d like, but the standard look should be more than enough for anyone just focusing on writing. Dark mode has also been dropped but is easily added by adding the following inside the &lt;code&gt;head&lt;/code&gt; tags:&lt;/p&gt;
 &lt;pre&gt;&lt;code&gt;&amp;lt;meta name=&amp;quot;color-scheme&amp;quot; content=&amp;quot;dark light&amp;quot;&amp;gt;
 &lt;/code&gt;&lt;/pre&gt;
-&lt;p&gt;Hopefully these changes reduce the overall scope of the project, which was a main point made on the README originally!&lt;/p&gt;]]></description>
-			<link>/cleanup</link>
-			<guid isPermaLink="false">/cleanup</guid>
+&lt;p&gt;Hopefully these changes reduce the overall scope of the project, which was a main point made on the README originally!&lt;/p&gt;</description>
+			<link>https://barf.btxx.org/cleanup</link>
+			<guid isPermaLink="false">https://barf.btxx.org/cleanup</guid>
 			<pubDate>Mon, 09 Oct 2023 00:00:00 +0000</pubDate>
 		</item>
 </channel>
blob - 417afa57f23ea7e76a16ddf66df1d205c1faf364
blob + 29715cd9b86ebe59a4f47c50bcac1cb050423795
--- build/websites/index.html
+++ build/websites/index.html
@@ -5,7 +5,8 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="icon" href="data:,">
 	<title>Websites Built with `barf`</title>
-	<link href="https://barf.btxx.org/atom.xml" type="application/atom+xml" rel="alternate" title="Atom feed for blog posts" />
+	<link href="/atom.xml" type="application/atom+xml" rel="alternate" title="Atom feed for blog posts" />
+	<link href="/rss.xml" type="application/rss+xml" rel="alternate" title="RSS feed for blog posts" />
 	<style>*{box-sizing:border-box;}body{font-family:sans-serif;margin:0 auto;max-width:650px;padding:1rem;}img{max-width:100%;}pre{overflow:auto;}</style>
 </head>
 
blob - b621f2eae62098ec2aef7e62d89d47583443b05d
blob + 7b95bf6a3c3abe8f91cb5d057a169917588e62d2
--- header.html
+++ header.html
@@ -5,7 +5,8 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="icon" href="data:,">
 	<title>{{TITLE}}</title>
-	<link href="https://barf.btxx.org/atom.xml" type="application/atom+xml" rel="alternate" title="Atom feed for blog posts" />
+	<link href="/atom.xml" type="application/atom+xml" rel="alternate" title="Atom feed for blog posts" />
+	<link href="/rss.xml" type="application/rss+xml" rel="alternate" title="RSS feed for blog posts" />
 	<style>*{box-sizing:border-box;}body{font-family:sans-serif;margin:0 auto;max-width:650px;padding:1rem;}img{max-width:100%;}pre{overflow:auto;}</style>
 </head>