From: David\ Beitey <david@davidjb.com>
Date: Tue, 8 Sep 2015 04:36:00 +0000 (+1000)
Subject: Specify configBridge as relative path to source
X-Git-Tag: v4.0.0-alpha.2~316^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a2fa5e60a2e0c6a493a7e7c427ebeb3355f8f16;p=thirdparty%2Fbootstrap.git

Specify configBridge as relative path to source

This adjusts the load path for the ``configBridge.json`` file from one
that's relative to the user running the command (eg ``jekyll serve``),
to one that's relative to the ``source`` configuration setting for
Jekyll.

The result is that the user can now have a (customised) ``_config.yml``
for Jekyll anywhere on her filesystem and point to Bootstrap's
``docs`` directory to use as the ``source``.  Previously, in order to
customise it, the original ``_config.yml`` needed to be modified inside
(a forked) Bootstrap, and the ``jekyll`` command could only be run at
the root of the Bootstrap package as the original file path to
``configBridge.json`` was only valid there.

The existing behaviour is not affected.
---

diff --git a/docs/_plugins/bridge.rb b/docs/_plugins/bridge.rb
index 450a6cce3e..a5d30a8f49 100644
--- a/docs/_plugins/bridge.rb
+++ b/docs/_plugins/bridge.rb
@@ -3,7 +3,8 @@ require 'yaml'
 module Bridge
   class Generator < Jekyll::Generator
     def generate(site)
-      site.data["configBridge"] = YAML.load_file("./grunt/configBridge.json")
+      path = File.join(site.source, "../grunt/configBridge.json")
+      site.data["configBridge"] = YAML.load_file(path)
     end
   end
 end
\ No newline at end of file