From 5e343f620a0dfbd7026570402a8529e0b206962d Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 15 Jun 2016 11:11:22 -0700
Subject: [PATCH 1/3] Move bin/jekyll to exe/jekyll to prevent collision with
 binstubs

---
 .gitignore          | 1 +
 {bin => exe}/jekyll | 0
 jekyll.gemspec      | 5 +++--
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename {bin => exe}/jekyll (100%)

diff --git a/.gitignore b/.gitignore
index 1d62ecc3..c2960b07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@
 /vendor
 Gemfile.lock
 _site/
+bin/
 bbin/
 coverage
 gh-pages/
diff --git a/bin/jekyll b/exe/jekyll
similarity index 100%
rename from bin/jekyll
rename to exe/jekyll
diff --git a/jekyll.gemspec b/jekyll.gemspec
index 3f32f0a9..b506ffa3 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -21,8 +21,9 @@ Gem::Specification.new do |s|
   s.homepage      = 'https://github.com/jekyll/jekyll'
 
   all_files       = `git ls-files -z`.split("\x0")
-  s.files         = all_files.grep(%r{^(bin|lib)/|^.rubocop.yml$})
-  s.executables   = all_files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.files         = all_files.grep(%r{^(exe|lib)/|^.rubocop.yml$})
+  s.executables   = all_files.grep(%r{^exe/}) { |f| File.basename(f) }
+  s.bindir        = "exe"
   s.require_paths = ['lib']
 
   s.rdoc_options = ['--charset=UTF-8']

From 6cf6da04af6c561a3571726afa03b9aa081e70d0 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 15 Jun 2016 12:12:44 -0700
Subject: [PATCH 2/3] features: change jekyll bin path to use exe/jekyll

---
 features/support/helpers.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/support/helpers.rb b/features/support/helpers.rb
index e7381a36..3a85a3b0 100644
--- a/features/support/helpers.rb
+++ b/features/support/helpers.rb
@@ -12,7 +12,7 @@ class Paths
 
   def self.status_file; test_dir.join("jekyll_status.txt"); end
 
-  def self.jekyll_bin; source_dir.join("bin", "jekyll"); end
+  def self.jekyll_bin; source_dir.join("exe", "jekyll"); end
 
   def self.source_dir; SOURCE_DIR; end
 end

From 3a1ac37ed10df3f7f3763cb43bf3359eecb44490 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 15 Jun 2016 12:26:01 -0700
Subject: [PATCH 3/3] Exclude exe/jekyll from rubocop for now.

---
 .rubocop.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.rubocop.yml b/.rubocop.yml
index ac0ce379..431b08ff 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,6 +4,7 @@ AllCops:
   Include:
   - lib/**/*.rb
   Exclude:
+  - exe/jekyll
   - lib/jekyll/collection.rb
   - lib/jekyll/command.rb
   - lib/jekyll/configuration.rb