tidy atom stuff

4 files changed, 29 insertions, 67 deletions

diff --git a/Makefile b/Makefile
index 94f7ae8..0275851 100644
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,6 @@ all: public/index.html public/index.atom $(addsuffix .html,$(articles))
 
 public/%.html: public/%.md page page.html.erb util.rb Makefile write-atomic
 	./page html $< | ./write-atomic $@
-public/%.atom: public/%.md page page.atom.erb util.rb Makefile write-atomic
-	./page atom $< | ./write-atomic $@
 public/index.md  : index index.md.erb   .var.articles $(addsuffix .md,$(articles)) util.rb Makefile write-atomic
 	./index md $(filter %.md,$^) | ./write-atomic $@
 public/index.atom: index index.atom.erb .var.articles $(addsuffix .md,$(articles)) util.rb Makefile write-atomic
diff --git a/index.atom.erb b/index.atom.erb
index 1784635..ea5f1ef 100644
--- a/index.atom.erb
+++ b/index.atom.erb
@@ -2,17 +2,16 @@
 <feed xmlns="http://www.w3.org/2005/Atom">
 
 	<title>Luke Shumaker's Web Log</title>
-	<link rel="self"      type="application/atom+xml" href="/blog/index.atom"/>
-	<link rel="alternate" type="text/markdown"        href="/blog/index.md"/>
-	<link rel="alternate" type="text/html"            href="/blog"/>
+	<link rel="self"      type="application/atom+xml" href="./index.atom"/>
+	<link rel="alternate" type="text/markdown"        href="./index.md"/>
+	<link rel="alternate" type="text/html"            href="./"/>
 	<updated><%= @pages.map{|p|p.gitdate}.sort.last.rfc3339 %></updated>
 	<author><%= Person.new("Luke Shumaker").atom %></author>
 	<id>https://lukeshu.com/blog/</id>
 
 	<% @pages.sort_by{|p| p.date}.reverse.each do |page| %>
 	<entry xmlns="http://www.w3.org/2005/Atom">
-		<link rel="alternate" type="text/markdown"             href="/blog/<%= page.slug %>.md"/>
-		<link rel="alternate" type="text/html"                 href="/blog/<%= page.slug %>.html"/>
+		<link rel="alternate" type="text/html" href="./<%= page.slug %>.html"/>
 		<id>https://lukeshu.com/blog/<%= page.slug %>.html</id>
 		<updated><%= page.gitdate.rfc3339 %></updated>
 		<published><%= page.date.rfc3339 %></published>
diff --git a/page.atom.erb b/page.atom.erb
deleted file mode 100644
index bc81380..0000000
--- a/page.atom.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<entry xmlns="http://www.w3.org/2005/Atom">
-	<link rel="alternate" type="text/markdown"             href="/blog/<%= @page.slug %>.md"/>
-	<link rel="alternate" type="text/application/atom+xml" href="/blog/<%= @page.slug %>.atom"/>
-	<link rel="alternate" type="text/html"                 href="/blog/<%= @page.slug %>.html"/>
-	<id>https://lukeshu.com/blog/<%= @page.slug %>.html</id>
-	<updated><%= @page.gitdate.rfc3339 %></updated>
-	<published><%= @page.date.rfc3339 %></published>
-	<title><%= @page.title %></title>
-	<content type="html"><%= html_escape(@page.content) %></content>
-	<author><%= @page.author.atom %></author>
-	<rights type="html"><%= html_escape(@page.rights) %></rights>
-</entry>
diff --git a/public/index.atom b/public/index.atom
index 7d9366b..760eb9d 100644
--- a/public/index.atom
+++ b/public/index.atom
@@ -2,17 +2,16 @@
 <feed xmlns="http://www.w3.org/2005/Atom">
 
 	<title>Luke Shumaker's Web Log</title>
-	<link rel="self"      type="application/atom+xml" href="/blog/index.atom"/>
-	<link rel="alternate" type="text/markdown"        href="/blog/index.md"/>
-	<link rel="alternate" type="text/html"            href="/blog"/>
+	<link rel="self"      type="application/atom+xml" href="./index.atom"/>
+	<link rel="alternate" type="text/markdown"        href="./index.md"/>
+	<link rel="alternate" type="text/html"            href="./"/>
 	<updated>2016-05-02T02:28:19-04:00</updated>
 	<author><name>Luke Shumaker</name><uri>https://lukeshu.com/</uri><email>lukeshu@sbcglobal.net</email></author>
 	<id>https://lukeshu.com/blog/</id>
 
 	
 	<entry xmlns="http://www.w3.org/2005/Atom">
-		<link rel="alternate" type="text/markdown"             href="/blog/x11-systemd.md"/>
-		<link rel="alternate" type="text/html"                 href="/blog/x11-systemd.html"/>
+		<link rel="alternate" type="text/html" href="./x11-systemd.html"/>
 		<id>https://lukeshu.com/blog/x11-systemd.html</id>
 		<updated>2016-02-28T07:12:18-05:00</updated>
 		<published>2016-02-28T00:00:00+00:00</published>
@@ -196,8 +195,7 @@ Requires=wm-running@%i.target&lt;/code&gt;&lt;/pre&gt;
 	</entry>
 	
 	<entry xmlns="http://www.w3.org/2005/Atom">
-		<link rel="alternate" type="text/markdown"             href="/blog/java-segfault-redux.md"/>
-		<link rel="alternate" type="text/html"                 href="/blog/java-segfault-redux.html"/>
+		<link rel="alternate" type="text/html" href="./java-segfault-redux.html"/>
 		<id>https://lukeshu.com/blog/java-segfault-redux.html</id>
 		<updated>2016-05-02T02:28:19-04:00</updated>
 		<published>2016-02-28T00:00:00+00:00</published>
@@ -279,8 +277,7 @@ public BufferedImage getBufferedImage() {
 	</entry>
 	
 	<entry xmlns="http://www.w3.org/2005/Atom">
-		<link rel="alternate" type="text/markdown"             href="/blog/nginx-mediawiki.md"/>
-		<link rel="alternate" type="text/html"                 href="/blog/nginx-mediawiki.html"/>
+		<link rel="alternate" type="text/html" href="./nginx-mediawiki.html"/>
 		<id>https://lukeshu.com/blog/nginx-mediawiki.html</id>
 		<updated>2015-05-19T23:53:52-06:00</updated>
 		<published>2015-05-19T00:00:00+00:00</published>
@@ -330,8 +327,7 @@ location @php {
 	</entry>
 	
 	<entry xmlns="http://www.w3.org/2005/Atom">
-		<link rel="alternate" type="text/markdown"             href="/blog/lp2015-videos.md"/>
-		<link rel="alternate" type="text/html"                 href="/blog/lp2015-videos.html"/>
+		<link rel="alternate" type="text/html" href="./lp2015-videos.html"/>
 		<id>https://lukeshu.com/blog/lp2015-videos.html</id>
 		<updated>2015-03-22T07:52:39-04:00</updated>
 		<published>2015-03-22T00:00:00+00:00</published>
@@ -348,8 +344,7 @@ location @php {
 	</entry>
 	
 	<entry xmlns="http://www.w3.org/2005/Atom">
-		<link rel="alternate" type="text/markdown"             href="/blog/build-bash-1.md"/>
-		<link rel="alternate" type="text/html"                 href="/blog/build-bash-1.html"/>
+		<link rel="alternate" type="text/html" href="./build-bash-1.html"/>
 		<id>https://lukeshu.com/blog/build-bash-1.html</id>
 		<updated>2016-05-02T02:20:41-04:00</updated>
 		<published>2015-03-18T00:00:00+00:00</published>
@@ -399,8 +394,7 @@ location @php {
 	</entry>
 	
 	<entry xmlns="http://www.w3.org/2005/Atom">
-		<link rel="alternate" type="text/markdown"             href="/blog/purdue-cs-login.md"/>
-		<link rel="alternate" type="text/html"                 href="/blog/purdue-cs-login.html"/>
+		<link rel="alternate" type="text/html" href="./purdue-cs-login.html"/>
 		<id>https://lukeshu.com/blog/purdue-cs-login.html</id>
 		<updated>2016-03-21T02:34:10-04:00</updated>
 		<published>2015-02-06T00:00:00+00:00</published>
@@ -490,8 +484,7 @@ SessionDesktopDir=/usr/local/share/xsessions/&lt;/code&gt;&lt;/pre&gt;
 	</entry>
 	
 	<entry xmlns="http://www.w3.org/2005/Atom">
-		<link rel="alternate" type="text/markdown"             href="/blog/make-memoize.md"/>
-		<link rel="alternate" type="text/html"                 href="/blog/make-memoize.html"/>
+		<link rel="alternate" type="text/html" href="./make-memoize.html"/>
 		<id>https://lukeshu.com/blog/make-memoize.html</id>
 		<updated>2016-03-21T02:34:10-04:00</updated>
 		<published>2014-11-20T00:00:00+00:00</published>
@@ -550,8 +543,7 @@ memoized = $(if $($(_hash)),,$(eval $(_hash) := _ $(_main)))$(call rest,$($(_has
 	</entry>
 	
 	<entry xmlns="http://www.w3.org/2005/Atom">
-		<link rel="alternate" type="text/markdown"             href="/blog/ryf-routers.md"/>
-		<link rel="alternate" type="text/html"                 href="/blog/ryf-routers.html"/>
+		<link rel="alternate" type="text/html" href="./ryf-routers.html"/>
 		<id>https://lukeshu.com/blog/ryf-routers.html</id>
 		<updated>2014-09-12T00:21:05-04:00</updated>
 		<published>2014-09-12T00:00:00+00:00</published>
@@ -575,8 +567,7 @@ memoized = $(if $($(_hash)),,$(eval $(_hash) := _ $(_main)))$(call rest,$($(_has
 	</entry>
 	
 	<entry xmlns="http://www.w3.org/2005/Atom">
-		<link rel="alternate" type="text/markdown"             href="/blog/what-im-working-on-fall-2014.md"/>
-		<link rel="alternate" type="text/html"                 href="/blog/what-im-working-on-fall-2014.html"/>
+		<link rel="alternate" type="text/html" href="./what-im-working-on-fall-2014.html"/>
 		<id>https://lukeshu.com/blog/what-im-working-on-fall-2014.html</id>
 		<updated>2016-02-28T07:12:18-05:00</updated>
 		<published>2014-09-11T00:00:00+00:00</published>
@@ -619,8 +610,7 @@ memoized = $(if $($(_hash)),,$(eval $(_hash) := _ $(_main)))$(call rest,$($(_has
 	</entry>
 	
 	<entry xmlns="http://www.w3.org/2005/Atom">
-		<link rel="alternate" type="text/markdown"             href="/blog/rails-improvements.md"/>
-		<link rel="alternate" type="text/html"                 href="/blog/rails-improvements.html"/>
+		<link rel="alternate" type="text/html" href="./rails-improvements.html"/>
 		<id>https://lukeshu.com/blog/rails-improvements.html</id>
 		<updated>2016-02-28T07:12:18-05:00</updated>
 		<published>2014-05-08T00:00:00+00:00</published>
@@ -680,8 +670,7 @@ end&lt;/code&gt;&lt;/pre&gt;
 	</entry>
 	
 	<entry xmlns="http://www.w3.org/2005/Atom">
-		<link rel="alternate" type="text/markdown"             href="/blog/bash-redirection.md"/>
-		<link rel="alternate" type="text/html"                 href="/blog/bash-redirection.html"/>
+		<link rel="alternate" type="text/html" href="./bash-redirection.html"/>
 		<id>https://lukeshu.com/blog/bash-redirection.html</id>
 		<updated>2014-05-08T14:36:47-04:00</updated>
 		<published>2014-02-13T00:00:00+00:00</published>
@@ -710,8 +699,7 @@ cmd &amp;gt;file 2&amp;gt;&amp;amp;1 # both stdout and stderr go to file&lt;/cod
 	</entry>
 	
 	<entry xmlns="http://www.w3.org/2005/Atom">
-		<link rel="alternate" type="text/markdown"             href="/blog/java-segfault.md"/>
-		<link rel="alternate" type="text/html"                 href="/blog/java-segfault.html"/>
+		<link rel="alternate" type="text/html" href="./java-segfault.html"/>
 		<id>https://lukeshu.com/blog/java-segfault.html</id>
 		<updated>2016-02-28T07:12:18-05:00</updated>
 		<published>2014-01-13T00:00:00+00:00</published>
@@ -758,8 +746,7 @@ cmd &amp;gt;file 2&amp;gt;&amp;amp;1 # both stdout and stderr go to file&lt;/cod
 	</entry>
 	
 	<entry xmlns="http://www.w3.org/2005/Atom">
-		<link rel="alternate" type="text/markdown"             href="/blog/bash-arrays.md"/>
-		<link rel="alternate" type="text/html"                 href="/blog/bash-arrays.html"/>
+		<link rel="alternate" type="text/html" href="./bash-arrays.html"/>
 		<id>https://lukeshu.com/blog/bash-arrays.html</id>
 		<updated>2016-02-28T07:12:18-05:00</updated>
 		<published>2013-10-13T00:00:00+00:00</published>
@@ -1054,8 +1041,7 @@ command &amp;quot;${ARGS[@]}&amp;quot;&lt;/code&gt;&lt;/pre&gt;
 	</entry>
 	
 	<entry xmlns="http://www.w3.org/2005/Atom">
-		<link rel="alternate" type="text/markdown"             href="/blog/git-go-pre-commit.md"/>
-		<link rel="alternate" type="text/html"                 href="/blog/git-go-pre-commit.html"/>
+		<link rel="alternate" type="text/html" href="./git-go-pre-commit.html"/>
 		<id>https://lukeshu.com/blog/git-go-pre-commit.html</id>
 		<updated>2014-01-26T17:00:58-05:00</updated>
 		<published>2013-10-12T00:00:00+00:00</published>
@@ -1091,8 +1077,7 @@ done&lt;/code&gt;&lt;/pre&gt;
 	</entry>
 	
 	<entry xmlns="http://www.w3.org/2005/Atom">
-		<link rel="alternate" type="text/markdown"             href="/blog/fd_printf.md"/>
-		<link rel="alternate" type="text/html"                 href="/blog/fd_printf.html"/>
+		<link rel="alternate" type="text/html" href="./fd_printf.html"/>
 		<id>https://lukeshu.com/blog/fd_printf.html</id>
 		<updated>2016-02-28T07:12:18-05:00</updated>
 		<published>2013-10-12T00:00:00+00:00</published>
@@ -1133,8 +1118,7 @@ fd_printf(int fd, const char *format, ...)
 	</entry>
 	
 	<entry xmlns="http://www.w3.org/2005/Atom">
-		<link rel="alternate" type="text/markdown"             href="/blog/emacs-as-an-os.md"/>
-		<link rel="alternate" type="text/html"                 href="/blog/emacs-as-an-os.html"/>
+		<link rel="alternate" type="text/html" href="./emacs-as-an-os.html"/>
 		<id>https://lukeshu.com/blog/emacs-as-an-os.html</id>
 		<updated>2014-01-26T17:00:58-05:00</updated>
 		<published>2013-08-29T00:00:00+00:00</published>
@@ -1153,8 +1137,7 @@ fd_printf(int fd, const char *format, ...)
 	</entry>
 	
 	<entry xmlns="http://www.w3.org/2005/Atom">
-		<link rel="alternate" type="text/markdown"             href="/blog/emacs-shells.md"/>
-		<link rel="alternate" type="text/html"                 href="/blog/emacs-shells.html"/>
+		<link rel="alternate" type="text/html" href="./emacs-shells.html"/>
 		<id>https://lukeshu.com/blog/emacs-shells.html</id>
 		<updated>2016-02-28T07:12:18-05:00</updated>
 		<published>2013-04-09T00:00:00+00:00</published>
@@ -1193,8 +1176,7 @@ M-x ansi-term&lt;/code&gt;&lt;/pre&gt;
 	</entry>
 	
 	<entry xmlns="http://www.w3.org/2005/Atom">
-		<link rel="alternate" type="text/markdown"             href="/blog/term-colors.md"/>
-		<link rel="alternate" type="text/html"                 href="/blog/term-colors.html"/>
+		<link rel="alternate" type="text/html" href="./term-colors.html"/>
 		<id>https://lukeshu.com/blog/term-colors.html</id>
 		<updated>2014-01-26T17:00:58-05:00</updated>
 		<published>2013-03-21T00:00:00+00:00</published>
@@ -1217,8 +1199,7 @@ M-x ansi-term&lt;/code&gt;&lt;/pre&gt;
 	</entry>
 	
 	<entry xmlns="http://www.w3.org/2005/Atom">
-		<link rel="alternate" type="text/markdown"             href="/blog/fs-licensing-explanation.md"/>
-		<link rel="alternate" type="text/html"                 href="/blog/fs-licensing-explanation.html"/>
+		<link rel="alternate" type="text/html" href="./fs-licensing-explanation.html"/>
 		<id>https://lukeshu.com/blog/fs-licensing-explanation.html</id>
 		<updated>2016-02-28T07:12:18-05:00</updated>
 		<published>2013-02-21T00:00:00+00:00</published>
@@ -1249,8 +1230,7 @@ M-x ansi-term&lt;/code&gt;&lt;/pre&gt;
 	</entry>
 	
 	<entry xmlns="http://www.w3.org/2005/Atom">
-		<link rel="alternate" type="text/markdown"             href="/blog/pacman-overview.md"/>
-		<link rel="alternate" type="text/html"                 href="/blog/pacman-overview.html"/>
+		<link rel="alternate" type="text/html" href="./pacman-overview.html"/>
 		<id>https://lukeshu.com/blog/pacman-overview.html</id>
 		<updated>2016-02-28T07:12:18-05:00</updated>
 		<published>2013-01-23T00:00:00+00:00</published>
@@ -1280,8 +1260,7 @@ M-x ansi-term&lt;/code&gt;&lt;/pre&gt;
 	</entry>
 	
 	<entry xmlns="http://www.w3.org/2005/Atom">
-		<link rel="alternate" type="text/markdown"             href="/blog/poor-system-documentation.md"/>
-		<link rel="alternate" type="text/html"                 href="/blog/poor-system-documentation.html"/>
+		<link rel="alternate" type="text/html" href="./poor-system-documentation.html"/>
 		<id>https://lukeshu.com/blog/poor-system-documentation.html</id>
 		<updated>2014-01-26T17:00:58-05:00</updated>
 		<published>2012-09-12T00:00:00+00:00</published>
@@ -1299,8 +1278,7 @@ M-x ansi-term&lt;/code&gt;&lt;/pre&gt;
 	</entry>
 	
 	<entry xmlns="http://www.w3.org/2005/Atom">
-		<link rel="alternate" type="text/markdown"             href="/blog/arch-systemd.md"/>
-		<link rel="alternate" type="text/html"                 href="/blog/arch-systemd.html"/>
+		<link rel="alternate" type="text/html" href="./arch-systemd.html"/>
 		<id>https://lukeshu.com/blog/arch-systemd.html</id>
 		<updated>2016-02-28T07:12:18-05:00</updated>
 		<published>2012-09-11T00:00:00+00:00</published>