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

Do not convert line ending of image/*.sh files on windows #238

Conversation

jecisc
Copy link
Contributor

@jecisc jecisc commented Apr 6, 2018

Cygwin cannot run scripts with crlf. I added image/*.sh to the gitattributes to not convert their line ending.

@akgrant43
Copy link
Contributor

Hi Cyril,

Which file was causing problems (so I can do a git checkout and manual inspect the file before applying your PR)?

Thanks,
Alistair

@jecisc
Copy link
Contributor Author

jecisc commented Apr 6, 2018

It was buildspurvmmakerimage.sh and all the scripts it calls.

@nicolas-cellier-aka-nice
Copy link
Contributor

Note that there is a workaround: put set -o igncr in your .bash_profile
See https://stackoverflow.com/questions/14598753/running-bash-script-in-cygwin-on-windows-7 for example.

I agree that it's preferable to correctly set the git file attributes and avoid the problem at the source!

@jecisc
Copy link
Contributor Author

jecisc commented Apr 6, 2018

Thank you for the information! I did not knew. I'll probably still try to avoid adding this, like that I'll encounter the problems and do PR to correct them.

@akgrant43 akgrant43 merged commit 563e1bd into OpenSmalltalk:Cog Apr 6, 2018
@jecisc jecisc deleted the cf_doNotChangeLineReturnsOfImageScriptsOnWindows branch April 6, 2018 22:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants