dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #5462: Only shutdown watch in Bash On Windows.

This commit is contained in:
Jordon Bedwell 2016-10-07 07:53:07 -05:00 committed by Parker Moore
parent 74a5297c19
commit d71dff74ae
No known key found for this signature in database
GPG Key ID: 193CDEBA72063C58
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/jekyll/commands/build.rb
View File

@ -71,10 +71,10 @@ module Jekyll
# #
# Returns nothing. # Returns nothing.
def watch(site, options) def watch(site, options)
if Utils::Platforms.windows? if Utils::Platforms.bash_on_windows?
Jekyll.logger.warn "", "--watch arg is unsupported on Windows. " Jekyll.logger.warn "", "--watch arg is unsupported in Bash on Windows. "
Jekyll.logger.warn "", "If you are on Windows Bash, please see: " \ Jekyll.logger.warn "", "Please see: https://github.com/Microsoft/BashOnWindows/issues/216"
"https://github.com/Microsoft/BashOnWindows/issues/216" Jekyll.logger.warn "", "If iNotify is fixed, please file a ticket."
else else
External.require_with_graceful_fail "jekyll-watch" External.require_with_graceful_fail "jekyll-watch"

19
lib/jekyll/utils/platforms.rb
View File

@ -19,16 +19,29 @@ module Jekyll
# /proc/version returns nothing to us. # /proc/version returns nothing to us.
# -- # --
def really_windows? def vanilla_windows?
RbConfig::CONFIG["host_os"] =~ %r!mswin|mingw|cygwin!i && \ RbConfig::CONFIG["host_os"] =~ %r!mswin|mingw|cygwin!i && \
!proc_version !proc_version
end end
# --
# XXX: Remove in 4.0
# --
alias_method :really_windows?, \
:vanilla_windows?
#
def bash_on_windows?
RbConfig::CONFIG["host_os"] =~ %r!linux! && \
proc_version =~ %r!microsoft!i
end
# #
def windows? def windows?
RbConfig::CONFIG["host_os"] =~ %r!mswin|mingw|cygwin!i || \ vanilla_windows? || bash_on_windows?
proc_version =~ %r!microsoft!i
end end
# #