Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #6498: Use Gem to discover the location of bundler. #6499

Merged
merged 1 commit into from Oct 29, 2017
Merged

Fix #6498: Use Gem to discover the location of bundler. #6499

merged 1 commit into from Oct 29, 2017

Conversation

envygeeks
Copy link
Contributor

No description provided.

@DirtyF DirtyF requested a review from a team October 29, 2017 15:10
mattr-
mattr- previously approved these changes Oct 29, 2017
@mattr-
Copy link
Member

mattr- commented Oct 29, 2017

@envygeeks it looks like this needs a rebase but is good to go after that.

Never mind. I don't think that's going to be an issue. Just going to wait for Travis to tell me it's green and then I'll merge.

@DirtyF
Copy link
Member

DirtyF commented Oct 29, 2017

Isn't the error on Appveyor related?

@mattr-
Copy link
Member

mattr- commented Oct 29, 2017

Isn't the error on Appveyor related?

Looks that way. I'm going to hold off on this then until that's fixed. I know Windows isn't officially supported but I don't see a reason to merge something that we know is going to regress that platform.

@ashmaroli
Copy link
Member

just confirmed.. I was unable to run script/default-site with this branch on my Windows machine..

@mattr- mattr- dismissed their stale review October 29, 2017 16:30

Code looks good but the windows build needs fixing.

@mattr- mattr- requested a review from a team October 29, 2017 16:31
@ashmaroli
Copy link
Member

@envygeeks The issue here is that Windows doesn't parse the shebang #!/usr/bin/env ruby like Unix does.. so to run a ruby executable on Windows, the program creates two helper files in the bin/ directory in the %PATH% (in this case, RUBY_VERSION/bin/bundler.bat and RUBY_VERSION/bin/bundler)

But in the context of this PR, you can achieve the same by passing "ruby" to the utility function

- process, output = Jekyll::Utils::Exec.run(exe, "install")
+ process, output = Jekyll::Utils::Exec.run("ruby", exe, "install")

@envygeeks
Copy link
Contributor Author

I'll get it fixed.

Copy link
Member

@mattr- mattr- left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mattr-
Copy link
Member

mattr- commented Oct 29, 2017

@jekyllbot: merge +dev

@jekyllbot jekyllbot merged commit 2ecf50f into jekyll:master Oct 29, 2017
jekyllbot added a commit that referenced this pull request Oct 29, 2017
@jekyll jekyll locked and limited conversation to collaborators Jul 12, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants