Make cygwinMSYSCheck more robust (#186) #187
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We cannot rely on `"-master`" being at the end of the filepath name in `cygwinMSYSCheck` on recent MinTTYs. To accommodate, this patch updates the implementation of `cygwinMSYSCheck` to match what `git-for-windows` does: * Always use `isInfixOf` to check if `"cygwin-"`, `"msys-"`, and "`-pty"` are in the filepath name. * Don't check `"-master"` at all, as this seems to assume a naming convention that could change in the future. Fixes #186.
|
Thanks! Ugh did someone move the 32-bit cabal.. |
|
Hmm looks like a CDN issue likely. |
|
Thanks, looks good, I'll merge and release tomorrow when Im behind a computer. |
RyanGlScott
added a commit
to RyanGlScott/mintty
that referenced
this pull request
Nov 7, 2021
This backports haskell/win32#187, the fix for haskell/win32#186. Fixes #2.
Merged
RyanGlScott
added a commit
to RyanGlScott/mintty
that referenced
this pull request
Nov 7, 2021
This backports haskell/win32#187, the fix for haskell/win32#186. Fixes #2.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We cannot rely on
"-master" being at the end of the filepath name incygwinMSYSCheckon recent MinTTYs.Description
To accommodate, this patch updates the implementation of
cygwinMSYSCheckto match whatgit-for-windowsdoes:isInfixOfto check if"cygwin-","msys-", and "-pty"are in the filepath name."-master"at all, as this seems to assume a naming convention that could change in the future.Motivation and Context
Fixes #186.
Types of changes
Checklist:
Win32.cabal.