Skip to content

Commit fe2ddfa

Browse files
authored
Merge pull request #34 from dra27/windows-fixes
Windows fixes
2 parents db7c29f + fcdc611 commit fe2ddfa

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

.gitattributes

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1-
* text=auto eol=lf
1+
* text=auto
2+
*.sh text eol=lf
3+
*.cmd text eol=crlf
4+
*.bat text eol=crlf
25
lib/* linguist-generated

lib/install-ocaml-windows.cmd

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"private": true,
33
"scripts": {
4-
"fmt": "prettier --write .",
5-
"fmt:check": "prettier --check .",
4+
"fmt": "prettier --end-of-line auto --write .",
5+
"fmt:check": "prettier --end-of-line auto --check .",
66
"lint": "eslint \"**/*.ts\" --cache",
77
"test": "jest",
88
"build:copy": "mkdir -p lib && shx cp src/*.{bat,cmd,sh} lib/",

src/install-ocaml-windows.cmd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ set CYGWIN_ROOT=c:\cygwin
33
set PATH=%CYGWIN_ROOT%\wrapperbin;%CYGWIN_ROOT%\bin;%PATH%
44
dos2unix %1\install-ocaml-windows.sh
55
bash -l %1\install-ocaml-windows.sh %3 %4
6+
@if %ERRORLEVEL% neq 0 exit /b 1
67
unix2dos %1\opam.bat
78
mkdir %CYGWIN_ROOT%\wrapperbin
89
copy %1\opam.bat %CYGWIN_ROOT%\wrapperbin\opam.bat

0 commit comments

Comments
 (0)