From 5e343f620a0dfbd7026570402a8529e0b206962d Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 15 Jun 2016 11:11:22 -0700 Subject: [PATCH] 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 1d62ecc3876..c2960b077fe 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 3f32f0a96d3..b506ffa30c3 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']