wip: Upgrade to jekyll 4

.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_PATH: "vendor"

.gitignore

@@ -1,2 +1,2 @@
-/Gemfile.lock
+/vendor
 _site/

Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'github-pages'
+gem 'jekyll'
+gem 'jekyll-gist'
+gem 'jekyll-paginate'

Gemfile.lock

@@ -0,0 +1,78 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    colorator (1.1.0)
+    concurrent-ruby (1.1.5)
+    em-websocket (0.5.1)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
+    eventmachine (1.2.7)
+    faraday (0.17.0)
+      multipart-post (>= 1.2, < 3)
+    ffi (1.11.1)
+    forwardable-extended (2.6.0)
+    http_parser.rb (0.6.0)
+    i18n (1.7.0)
+      concurrent-ruby (~> 1.0)
+    jekyll (4.0.0)
+      addressable (~> 2.4)
+      colorator (~> 1.0)
+      em-websocket (~> 0.5)
+      i18n (>= 0.9.5, < 2)
+      jekyll-sass-converter (~> 2.0)
+      jekyll-watch (~> 2.0)
+      kramdown (~> 2.1)
+      kramdown-parser-gfm (~> 1.0)
+      liquid (~> 4.0)
+      mercenary (~> 0.3.3)
+      pathutil (~> 0.9)
+      rouge (~> 3.0)
+      safe_yaml (~> 1.0)
+      terminal-table (~> 1.8)
+    jekyll-gist (1.5.0)
+      octokit (~> 4.2)
+    jekyll-paginate (1.1.0)
+    jekyll-sass-converter (2.0.1)
+      sassc (> 2.0.1, < 3.0)
+    jekyll-watch (2.2.1)
+      listen (~> 3.0)
+    kramdown (2.1.0)
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    liquid (4.0.3)
+    listen (3.2.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    mercenary (0.3.6)
+    multipart-post (2.1.1)
+    octokit (4.14.0)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    pathutil (0.16.2)
+      forwardable-extended (~> 2.6)
+    public_suffix (4.0.1)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    rouge (3.12.0)
+    safe_yaml (1.0.5)
+    sassc (2.2.1)
+      ffi (~> 1.9)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    unicode-display_width (1.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jekyll
+  jekyll-gist
+  jekyll-paginate
+
+BUNDLED WITH
+   2.0.2

_config.yml

@@ -2,7 +2,6 @@
 title: Gergely Polonkai
 email: gergely@polonkai.eu
 description: "developer, systems engineer and administrator"
-baseurl: ""
 url: "http://gergely.polonkai.eu"
 timezone: Europe/Budapest
 name: Gergely Polonkai

_includes/blog-post.html

@@ -10,11 +10,11 @@
                 <h3>
 {% endif %}
 {% if page.post_listing %}
-<a href="{{post.url | prepend: site.baseurl}}">
+                    <a href="{{ post.url }}">
 {% endif %}
-{{post.title}}
+                        {{ post.title }}
 {% if page.post_listing %}
-</a>
+                    </a>
 {% endif %}
 {% if page.tag %}
                 </h5>

_includes/head.html

@@ -4,11 +4,11 @@
         <meta name="description" content="Personal page of Gergely Polonkai">
         <title>Gergely Polonkai{% if page.title %}: {{page.title}}{% endif %}</title>
 
-        <link rel="icon" type="image/x-icon" href="{{'/favicon.ico' | prepend: site.baseurl}}">
+        <link rel="icon" type="image/x-icon" href="{% link favicon.ico %}">
         <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic" rel="stylesheet" type="text/css">
         <link rel="alternate" type="application/rss+xml" title="Gergely Polonkai's Blog - RSS Feed" href="{{site.url}}/blog/atom.xml">
         <link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css">
-        <link rel="stylesheet" href="{{'/css/style.css' | prepend: site.baseurl}}">
+        <link rel="stylesheet" href="{% link css/style.css %}">
         <link href="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/1.6.3/css/jquery.terminal.min.css" rel="stylesheet"/>
 
         <script type="text/javascript" src="//code.jquery.com/jquery-2.1.3.min.js"></script>

_includes/header.html

@@ -6,27 +6,27 @@
                             <span class="icon-bar"></span>
                             <span class="icon-bar"></span>
                         </button>
-                        <a class="navbar-brand" href="{{'/' | prepend: site.baseurl}}"><img src="{{'/images/profile.svg' | prepend: site.baseurl}}" alt="Gergely Polonkai" style="background-color: white; height: 45px; margin-top: -13px;"></a>
+                        <a class="navbar-brand" href="{% link index.html %}"><img src="{% link images/profile.svg %}" alt="Gergely Polonkai" style="background-color: white; height: 45px; margin-top: -13px;"></a>
 {% if page.url != '/' %}
-                        <a class="navbar-brand" href="{{'/' | prepend: site.baseurl}}">Gergely Polonkai</a>
+                        <a class="navbar-brand" href="{% link index.html %}">Gergely Polonkai</a>
 {% endif %}
                     </div>
                     <div class="collapse navbar-collapse" id="gp-navbar">
                         <ul class="nav navbar-nav">
-                            <li><a href="{{'/blog' | prepend: site.baseurl}}">Blog</a></li>
+                            <li><a href="{% link blog/index.html %}">Blog</a></li>
-                            <li><a href="{{'/resume' | prepend: site.baseurl}}">Resume</a></li>
+                            <li><a href="{% link resume.html %}">Resume</a></li>
-                            <li><a href="{{'/stories' | prepend: site.baseurl}}">Stories</a></li>
+                            <li><a href="{% link stories/index.html %}">Stories</a></li>
                         </ul>
                         <ul class="nav navbar-nav navbar-right">
                             <li><a href="https://about.me/gergely.polonkai">about.me</a></li>
-                            <li><a href="{{'/disclaimer' | prepend: site.baseurl}}">Disclaimer</a></li>
+                            <li><a href="{% link disclaimer.md %}">Disclaimer</a></li>
                             <li class="dropdown">
                                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><span class="glyphicon glyphicon-pencil"></span> Contact me <span class="caret"></span></a>
                                 <ul class="dropdown-menu" role="menu">
 {% for contact in site.data.contacts %}
-                                    <li><a href="{{contact.link}}" target="_blank"><i class="fa fa-{{ contact.icon }}"></i> <img src="{{'/images/contact/' | prepend: site.baseurl | append: contact.image}}" alt="" /> {{contact.text}}</a></li>
+                                    <li><a href="{{contact.link}}" target="_blank"><i class="fa fa-{{ contact.icon }}"></i> <img src="{% link images/contact/index.html %}{{ contact.image }}" alt="" /> {{contact.text}}</a></li>
 {% endfor %}
-                                    <li><a href="{{'/blog/atom.xml' | prepend: site.baseurl}}"><img src="{{'/images/contact/feed.png' | prepend: site.baseurl}}" alt="" /> RSS Feed</a></li>
+                                    <li><a href="{% link blog/atom.xml %}"><img src="{% link images/contact/index.html %}feed.png" alt="" /> RSS Feed</a></li>
                                 </ul>
                             </li>
                         </ul>

_includes/pagination.html

@@ -1,15 +1,15 @@
 <nav>
     <ul class="pagination">
         <li{% if paginator.previous_page == null %} class="disabled"{% endif %}>
-            <a href="{{paginator.previous_page_path | prepend: site.baseurl | replace: '//', '/'}}" aria-label="Previous page">
+            <a href="{{ paginator.previous_page_path | replace: '//', '/'}}" aria-label="Previous page">
                 <span aria-hidden="true">&laquo;</span>
             </a>
         </li>
 {% for page in (1..paginator.total_pages) %}
-        <li{% if paginator.page == page %} class="active"{% endif %}><a href="{% if page == 1 %}{{'/blog' | prepend: site.baseurl}}{% else %}{{site.paginate_path | prepend: site.baseurl | replace: '//', '/' | replace: ':num', page}}{% endif %}">{{page}}</a></li>
+        <li{% if paginator.page == page %} class="active"{% endif %}><a href="{% if page == 1 %}{% link blog/index.html %}{% else %}{{ site.paginate_path | replace: '//', '/' | replace: ':num', page }}{% endif %}">{{page}}</a></li>
 {% endfor %}
         <li{% if paginator.next_page == null %} class="disabled"{% endif %}>
-            <a href="{{paginator.next_page_path | prepend: site.baseurl | replace: '//', '/'}}" aria-label="Next page">
+            <a href="{{paginator.next_page_path | replace: '//', '/'}}" aria-label="Next page">
                 <span aria-hidden="true">&raquo;</span>
             </a>
         </li>

_includes/tag-link.html

@@ -3,7 +3,7 @@
             <footer>
                 <p class="article-tags">
 {%     for tag in post.tags %}
-                    <a href="{{tag | prepend: '/blog/tag/' | prepend: site.baseurl}}" class="tag-label">{{tag}}</a>
+                    <a href="{% link blog/tag/index.html %}{{ tag }}" class="tag-label">{{tag}}</a>
 {%     endfor %}
                 </p>
                 <br class="clearfix">

_layouts/default.html

@@ -12,8 +12,8 @@
 {% if page.name != 'about.html' %}
             <div class="well well-sm small">
                 <div class="pull-left" id="about-well-image">
-                    <a href="{{ site_url }}/about/">
+                    <a href="{% link about.html %}">
-                        <img src="{{'/images/profile.svg' | prepend: site.baseurl}}" alt="">
+                        <img src="{% link images/profile.svg %}" alt="">
                     </a>
                 </div>
 {%     include about.html %}
@@ -99,7 +99,7 @@
 
                          break;
                      case 'about':
-                         location = '{{ site_url }}/about/';
+                         location = '{% link about.html %}';
 
                          break;
                      default:

_layouts/post.html

@@ -7,10 +7,10 @@ render_post: true
 <nav>
     <ul class="pager">
 {% if page.previous %}
-        <li class="previous"><a href="{{page.previous.url | prepend: site.baseurl}}">&larr; {{page.previous.title}}</a></li>
+        <li class="previous"><a href="{{ page.previous.url }}">&larr; {{page.previous.title}}</a></li>
 {% endif %}
 {% if page.next %}
-        <li class="next"><a href="{{page.next.url | prepend: site.baseurl}}">{{page.next.title}} &rarr;</a></li>
+        <li class="next"><a href="{{ page.next.url }}">{{page.next.title}} &rarr;</a></li>
 {% endif %}
     </ul>
 </nav>

_posts/2015-08-19-foss-failmeter.md

@@ -13,7 +13,7 @@ I have recently bumped into [this
 article](http://spot.livejournal.com/308370.html). Naturally, I quickly
 calculated the FAIL metrics for all my projects (most of them are pretty high).
 To ease calculation, I made up a
-[small page]({{ '/failmeter/' | prepend: site.baseurl }}) based on this list
+[small page]({% link failmeter/index.html %}) based on this list
 (although I have divided the points by 5; I really don’t understand why spot is
 using such big points if all of them can be divided by 5). Feel free to use it,
 and if you have any recommendations (point additions/removal, new categories,

_posts/2016-09-28-emacs-package-to-generate-gobject-boilerplate.md

@@ -30,7 +30,7 @@ it felt to be a really poor experience, especially given that I made
 my feet wet with Emacs Lisp. So I dug deeper, and created a package
 for that.
 
-![A screenshot of GobGen in action]({{ site_url }}/images/screenshot-gobgen.png)
+![A screenshot of GobGen in action]({% link images/screenshot-gobgen.png %})
 
 GobGen has its own buffer with some widgets, a bit similar to
 `customize`. You can enter the name of your new object and its parent,

_posts/2016-11-03-how-i-started-with-emacs.md

@@ -34,16 +34,16 @@ fan of Nyan cat (did you know there is even a site
 called [nyan.cat](http://nyan.cat/)?) and since then I have it in my
 mode line:
 
-![Nyan modeline]({{ site_url }}/images/nyan-modeline.png)
+![Nyan modeline]({% link images/nyan-modeline.png %})
 
 …in my `eshell` prompt:
 
-![IMAGE HERE]({{ site_url }}/images/nyan-eshell.png)
+![eshell prompt with a Nyan cat]({% link images/nyan-eshell.png %})
 
 …and I also [zone out](https://www.emacswiki.org/emacs/ZoneMode) with
 Nyan cat:
 
-![IMAGE HERE]({{ site_url }}/images/nyan-zone.png)
+![a text-based animation with Nyan cat]({% link images/nyan-zone.png %})
 
 Now on to more serious stuff. After browsing through all the packages
 provided by [ELPA](http://elpa.gnu.org/), I found tons of useful (and

blog/tag/index.html

@@ -0,0 +1,2 @@
+---
+---

images/contact/index.html

@@ -0,0 +1,2 @@
+---
+---

index.html

@@ -22,7 +22,7 @@ post_listing: true
 <nav>
     <ul class="pager">
         <li class="next">
-            <a href="{{ site_url }}/blog/">
+            <a href="{% link blog/index.html %}">
                 Take me to all the blog posts! <span aria-hidden="true">&rarr;</span>
             </a>
         </li>