add --whitespace=nowarn for all git apply

3 files changed, 13 insertions, 13 deletions

diff --git a/install.bat b/install.bat
index 477382a..a9546f9 100644
--- a/install.bat
+++ b/install.bat
@@ -24,20 +24,20 @@ set PATCH_DIR=%TORCH_DISTRO%\win-files\patch
 echo %ECHO_PREFIX% Installing common lua packages
 cd %TORCH_DISTRO%\extra\luafilesystem && call %LUAROCKS_CMD% make rockspecs\luafilesystem-1.6.3-1.rockspec || goto :FAIL
 cd %TORCH_DISTRO%\extra\penlight && call %LUAROCKS_CMD% make penlight-scm-1.rockspec || goto :FAIL
-cd %TORCH_DISTRO%\extra\lua-cjson && git apply %PATCH_DIR%\lua-cjson.patch & call %LUAROCKS_CMD% make lua-cjson-2.1devel-1.rockspec & git apply %PATCH_DIR%\lua-cjson.patch --reverse || goto :FAIL
+cd %TORCH_DISTRO%\extra\lua-cjson && git apply %PATCH_DIR%\lua-cjson.patch --whitespace=nowarn & call %LUAROCKS_CMD% make lua-cjson-2.1devel-1.rockspec & git apply %PATCH_DIR%\lua-cjson.patch --reverse --whitespace=nowarn || goto :FAIL
 
 echo %ECHO_PREFIX% Installing core Torch7 packages
-cd %TORCH_DISTRO%\extra\luaffifb && git apply %PATCH_DIR%\luaffifb.patch & call %LUAROCKS_CMD% make luaffi-scm-1.rockspec & git apply %PATCH_DIR%\luaffifb.patch --reverse || goto :FAIL
+cd %TORCH_DISTRO%\extra\luaffifb && git apply %PATCH_DIR%\luaffifb.patch --whitespace=nowarn & call %LUAROCKS_CMD% make luaffi-scm-1.rockspec & git apply %PATCH_DIR%\luaffifb.patch --reverse --whitespace=nowarn || goto :FAIL
 cd %TORCH_DISTRO%\pkg\sundown && call %LUAROCKS_CMD% make rocks\sundown-scm-1.rockspec || goto :FAIL
 cd %TORCH_DISTRO%\pkg\cwrap && call %LUAROCKS_CMD% make rocks\cwrap-scm-1.rockspec || goto :FAIL
 cd %TORCH_DISTRO%\pkg\paths && call %LUAROCKS_CMD% make rocks\paths-scm-1.rockspec || goto :FAIL
 if "%TORCH_SETUP_HAS_MKL%" == "1" (
-  cd %TORCH_DISTRO%\pkg\torch && git apply %PATCH_DIR%\torch.patch & call %LUAROCKS_CMD% make rocks\torch-scm-1.rockspec INTEL_MKL_DIR="%INTEL_MKL_DIR%" INTEL_COMPILER_DIR="%INTEL_COMPILER_DIR%" & git apply %PATCH_DIR%\torch.patch --reverse || goto :FAIL
+  cd %TORCH_DISTRO%\pkg\torch && git apply %PATCH_DIR%\torch.patch --whitespace=nowarn & call %LUAROCKS_CMD% make rocks\torch-scm-1.rockspec INTEL_MKL_DIR="%INTEL_MKL_DIR%" INTEL_COMPILER_DIR="%INTEL_COMPILER_DIR%" & git apply %PATCH_DIR%\torch.patch --reverse --whitespace=nowarn || goto :FAIL
 ) else (
   if "%TORCH_SETUP_HAS_LAPACK%" == "1" (
-    cd %TORCH_DISTRO%\pkg\torch && git apply %PATCH_DIR%\torch.patch & call %LUAROCKS_CMD% make rocks\torch-scm-1.rockspec BLAS_LIBRARIES="%BLAS_LIBRARIES%" LAPACK_LIBRARIES="%LAPACK_LIBRARIES%" LAPACK_FOUND=TRUE & git apply %PATCH_DIR%\torch.patch --reverse || goto :FAIL
+    cd %TORCH_DISTRO%\pkg\torch && git apply %PATCH_DIR%\torch.patch --whitespace=nowarn & call %LUAROCKS_CMD% make rocks\torch-scm-1.rockspec BLAS_LIBRARIES="%BLAS_LIBRARIES%" LAPACK_LIBRARIES="%LAPACK_LIBRARIES%" LAPACK_FOUND=TRUE & git apply %PATCH_DIR%\torch.patch --reverse --whitespace=nowarn || goto :FAIL
   ) else (
-    cd %TORCH_DISTRO%\pkg\torch && git apply %PATCH_DIR%\torch.patch & call %LUAROCKS_CMD% make rocks\torch-scm-1.rockspec & git apply %PATCH_DIR%\torch.patch --reverse || goto :FAIL
+    cd %TORCH_DISTRO%\pkg\torch && git apply %PATCH_DIR%\torch.patch --whitespace=nowarn & call %LUAROCKS_CMD% make rocks\torch-scm-1.rockspec & git apply %PATCH_DIR%\torch.patch --reverse --whitespace=nowarn || goto :FAIL
   )
 )
 cd %TORCH_DISTRO%\pkg\dok && call %LUAROCKS_CMD% make rocks\dok-scm-1.rockspec || goto :FAIL
@@ -53,7 +53,7 @@ cd %TORCH_DISTRO%\pkg\optim && call %LUAROCKS_CMD% make optim-1.0.5-0.rockspec |
 if not "%TORCH_SETUP_HAS_CUDA%" == "" (
   echo %ECHO_PREFIX% Found CUDA on your machine. Installing CUDA packages
   cd %TORCH_DISTRO%\extra\cutorch && call %LUAROCKS_CMD% make rocks\cutorch-scm-1.rockspec || goto :FAIL
-  cd %TORCH_DISTRO%\extra\cunn && git apply %TORCH_DISTRO%\win-files\patch\cunn.patch & call %LUAROCKS_CMD% make rocks\cunn-scm-1.rockspec & git apply %TORCH_DISTRO%\win-files\patch\cunn.patch --reverse || goto :FAIL
+  cd %TORCH_DISTRO%\extra\cunn && git apply %TORCH_DISTRO%\win-files\patch\cunn.patch --whitespace=nowarn & call %LUAROCKS_CMD% make rocks\cunn-scm-1.rockspec & git apply %TORCH_DISTRO%\win-files\patch\cunn.patch --reverse --whitespace=nowarn || goto :FAIL
 )
 
 echo %ECHO_PREFIX% Installing optional Torch7 packages
@@ -67,7 +67,7 @@ cd %TORCH_DISTRO%\extra\argcheck && call %LUAROCKS_CMD% make rocks\argcheck-scm-
 
 if not "%TORCH_SETUP_HAS_CUDA%" == "" (
   echo %ECHO_PREFIX% Found CUDA on your machine. Installing optional CUDA packages
-  cd %TORCH_DISTRO%\extra\cudnn && git apply %TORCH_DISTRO%\win-files\patch\cudnn.patch & call %LUAROCKS_CMD% make cudnn-scm-1.rockspec & git apply %TORCH_DISTRO%\win-files\patch\cudnn.patch --reverse
+  cd %TORCH_DISTRO%\extra\cudnn && git apply %TORCH_DISTRO%\win-files\patch\cudnn.patch --whitespace=nowarn & call %LUAROCKS_CMD% make cudnn-scm-1.rockspec & git apply %TORCH_DISTRO%\win-files\patch\cudnn.patch --reverse --whitespace=nowarn
 )
 
 echo %ECHO_PREFIX% Installation succeed!
diff --git a/test.bat b/test.bat
index 8933175..8c679a7 100644
--- a/test.bat
+++ b/test.bat
@@ -26,7 +26,7 @@ if exist "%LUA%" (
 :AFTER_LUA
 if not exist "%LUA%" (
   echo Neither luajit nor lua found in Torch7 environment
-  goto :Fail
+  goto :FAIL
 )
 
 set LUA_SAFE_PATH=%LUA:\=\\%
diff --git a/win-files/README.md b/win-files/README.md
index 53b7d2d..dc03c24 100644
--- a/win-files/README.md
+++ b/win-files/README.md
@@ -61,7 +61,7 @@ It will automatically install not installed dependencies.
 
 #### Run torch-activate.cmd, then use availabe Torch executables
 ```bat
-path_to_Torch\torch-activate.cmd
+path_to_Torch\torch-activate
 th
 ```
 Trepl on windows should work similarly as on linux or macos.
@@ -74,18 +74,18 @@ clean.bat
 
 To remove the installation:
 ```bat
-path_to_Torch\torch-activate.cmd
+path_to_Torch\torch-activate
 uninstall.bat
 ```
-torch-activate.cmd is called before uninstall.bat so that unstall knows which Torch7 to uninstall.
+torch-activate.cmd is called before uninstall.bat so that uninstall knows which Torch7 to uninstall.
 In addition to clean.bat, this will remove the directory pointed to by TORCH\_INSTALL\_DIR and TORCH\_CONDA\_ENV from conda.
 
 ## Test
 You can test that all libraries are installed properly by running:
 ```bat
-path_to_Torch\torch-activate.cmd
+path_to_Torch\torch-activate
 test.bat
 ```
 torch-activate.cmd is called before test.bat so that test knows which Torch7 to test.
 
-Tested on Windows 10, Visual Studio Community 2015, Anaconda4, Cuda Toolkit8.0, MKL2017
+Tested on Windows 10 x64, Visual Studio Community 2015, Anaconda4, Cuda Toolkit8.0, MKL2017