From ab10feb6a5fe03f24fc6073509276c4cf47e1f32 Mon Sep 17 00:00:00 2001 From: David Fischer Date: Tue, 18 Dec 2018 11:45:19 -0800 Subject: [PATCH] Fix line endings (#709) * Note that .bat has CRLF endings * Remove line endings on .bat It will be normalized correctly on checkout --- .gitattributes | 1 + docs/make.bat | 76 +++++++++++++++++++++++++------------------------- 2 files changed, 39 insertions(+), 38 deletions(-) diff --git a/.gitattributes b/.gitattributes index 2be5a44c..60eac253 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,7 @@ # Document global line endings settings # https://help.github.com/articles/dealing-with-line-endings/ * text eol=lf +*.bat text eol=crlf # Denote all files that are truly binary and should not be modified. diff --git a/docs/make.bat b/docs/make.bat index bc934aa6..7c9b71a8 100644 --- a/docs/make.bat +++ b/docs/make.bat @@ -1,38 +1,38 @@ -@ECHO OFF - -pushd %~dp0 - -REM Command file for Sphinx documentation - -if "%SPHINXBUILD%" == "" ( - set SPHINXBUILD=python -msphinx -) -set SPHINXOPTS= -set SPHINXBUILD=sphinx-build -set SOURCEDIR=. -set BUILDDIR=build -set SPHINXPROJ=ReadtheDocsSphinxTheme - -if "%1" == "" goto help - -%SPHINXBUILD% >NUL 2>NUL -if errorlevel 9009 ( - echo. - echo.The Sphinx module was not found. Make sure you have Sphinx installed, - echo.then set the SPHINXBUILD environment variable to point to the full - echo.path of the 'sphinx-build' executable. Alternatively you may add the - echo.Sphinx directory to PATH. - echo. - echo.If you don't have Sphinx installed, grab it from - echo.http://sphinx-doc.org/ - exit /b 1 -) - -%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% -goto end - -:help -%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% - -:end -popd +@ECHO OFF + +pushd %~dp0 + +REM Command file for Sphinx documentation + +if "%SPHINXBUILD%" == "" ( + set SPHINXBUILD=python -msphinx +) +set SPHINXOPTS= +set SPHINXBUILD=sphinx-build +set SOURCEDIR=. +set BUILDDIR=build +set SPHINXPROJ=ReadtheDocsSphinxTheme + +if "%1" == "" goto help + +%SPHINXBUILD% >NUL 2>NUL +if errorlevel 9009 ( + echo. + echo.The Sphinx module was not found. Make sure you have Sphinx installed, + echo.then set the SPHINXBUILD environment variable to point to the full + echo.path of the 'sphinx-build' executable. Alternatively you may add the + echo.Sphinx directory to PATH. + echo. + echo.If you don't have Sphinx installed, grab it from + echo.http://sphinx-doc.org/ + exit /b 1 +) + +%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% +goto end + +:help +%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% + +:end +popd