Skip to content

Commit fe89c00

Browse files
committed
MAINT: normalize line ends in Windows .bat files
Store with sane line ends, but use CRLF in work tree.
1 parent a5b8201 commit fe89c00

2 files changed

Lines changed: 18 additions & 17 deletions

File tree

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
/conda-recipe/ export-ignore
55
/devutils export-ignore
66
.gitarchive.cfg export-subst
7+
*.bat text eol=crlf

conda-recipe/bld.bat

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
%PYTHON% setup.py install
2-
if errorlevel 1 exit 1
3-
4-
:: Add more build steps here, if they are necessary.
5-
6-
set MENU_DIR=%PREFIX%\Menu
7-
if not exist (%MENU_DIR%) mkdir %MENU_DIR%
8-
9-
cd %RECIPE_DIR%
10-
%PYTHON% expandpdfguibase.py menu-windows.json > %MENU_DIR%\menu-windows.json
11-
if errorlevel 1 exit 1
12-
13-
copy pdfgui.ico %MENU_DIR%\
14-
if errorlevel 1 exit 1
15-
16-
:: See http://docs.continuum.io/conda/build.html
17-
:: for a list of environment variables that are set during the build process.
1+
%PYTHON% setup.py install
2+
if errorlevel 1 exit 1
3+
4+
:: Add more build steps here, if they are necessary.
5+
6+
set MENU_DIR=%PREFIX%\Menu
7+
if not exist (%MENU_DIR%) mkdir %MENU_DIR%
8+
9+
cd %RECIPE_DIR%
10+
%PYTHON% expandpdfguibase.py menu-windows.json > %MENU_DIR%\menu-windows.json
11+
if errorlevel 1 exit 1
12+
13+
copy pdfgui.ico %MENU_DIR%\
14+
if errorlevel 1 exit 1
15+
16+
:: See http://docs.continuum.io/conda/build.html
17+
:: for a list of environment variables that are set during the build process.

0 commit comments

Comments
 (0)