Move bin/jekyll to exe/jekyll to prevent collision with binstubs

ekospt · Jun 15, 2016 · 5e343f6 · 5e343f6
1 parent ddf8335
commit 5e343f6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,7 @@
 /vendor
 Gemfile.lock
 _site/
+bin/
 bbin/
 coverage
 gh-pages/

diff --git a/bin/jekyll → exe/jekyll b/bin/jekyll → exe/jekyll
diff --git 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']
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,7 @@ @@
     /vendor
     Gemfile.lock
     _site/
+    bin/
     bbin/
     coverage
     gh-pages/
@@ Expand Down @@