From 213ecd511255572d219adc78f48a10bbab76563a Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 8 Oct 2015 10:32:13 -0400 Subject: Windows: make get-scala-commit-sha/date scripts work on Cygwin bash's -x flag was flowing down into these scripts, resulting in extra stuff was getting printed to stderr, resulting in a corrupted build\pack\META-INF\MANIFEST.MF --- tools/get-scala-commit-date.bat | 4 ++-- tools/get-scala-commit-sha.bat | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/get-scala-commit-date.bat b/tools/get-scala-commit-date.bat index e169de1b04..735a80b927 100644 --- a/tools/get-scala-commit-date.bat +++ b/tools/get-scala-commit-date.bat @@ -1,9 +1,9 @@ @echo off for %%X in (bash.exe) do (set FOUND=%%~$PATH:X) if defined FOUND ( - bash "%~dp0\get-scala-commit-date" + bash "%~dp0\get-scala-commit-date" 2>NUL ) else ( rem echo this script does not work with cmd.exe. please, install bash echo unknown exit 1 -) \ No newline at end of file +) diff --git a/tools/get-scala-commit-sha.bat b/tools/get-scala-commit-sha.bat index 1eaffc0a15..6559a19120 100644 --- a/tools/get-scala-commit-sha.bat +++ b/tools/get-scala-commit-sha.bat @@ -1,9 +1,9 @@ @echo off for %%X in (bash.exe) do (set FOUND=%%~$PATH:X) if defined FOUND ( - bash "%~dp0\get-scala-commit-sha" + bash "%~dp0\get-scala-commit-sha" 2>NUL ) else ( rem echo this script does not work with cmd.exe. please, install bash echo unknown exit 1 -) \ No newline at end of file +) -- cgit v1.2.3