fix for get-scala-commit-* on Windows (tested with Windows 7)

2 files changed, 18 insertions, 45 deletions

diff --git a/tools/get-scala-commit-date.bat b/tools/get-scala-commit-date.bat
index a07155533f..2a75073633 100644
--- a/tools/get-scala-commit-date.bat
+++ b/tools/get-scala-commit-date.bat
@@ -1,24 +1,9 @@
-@echo off
-rem
-rem Usage: get-scala-revison.bat [dir]
-rem Figures out current scala commit date of a git clone.
-rem
-rem If no dir is given, current working dir is used.
-
-@setlocal
-set _DIR=
-if "%*"=="" (
-  for /f "delims=;" %%i in ('cd') do set "_DIR=%%i"
-) else (
-  set "_DIR=%~1"
-)
-cd %_DIR%
-
-rem  TODO - Check with a real windows user that this works!
-if exist .git\NUL (
-  for /f "tokens=1delims= " in ('git log --format="%ci" -1') do set commitdate=%%a
-  echo %commitdate%
-)
-
-:end
-@endlocal
+@echo off

+for %%X in (bash.exe) do (set FOUND=%%~$PATH:X)

+if defined FOUND (

+  bash "%~dp0\get-scala-commit-date"

+) 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 7a5afa11b1..390e2d99d0 100644
--- a/tools/get-scala-commit-sha.bat
+++ b/tools/get-scala-commit-sha.bat
@@ -1,21 +1,9 @@
-@echo off
-rem
-rem Usage: get-scala-commit-drift.bat [dir]
-rem Figures out current scala commit drift, of a clone.
-rem
-rem If no dir is given, current working dir is used.
-
-@setlocal
-set _DIR=
-if "%*"=="" (
-  for /f "delims=;" %%i in ('cd') do set "_DIR=%%i"
-) else (
-  set "_DIR=%~1"
-)
-cd %_DIR%
-
-rem  TODO - truncate chars.
-git log -1 --format="%H
-
-:end
-@endlocal
+@echo off

+for %%X in (bash.exe) do (set FOUND=%%~$PATH:X)

+if defined FOUND (

+  bash "%~dp0\get-scala-commit-sha"

+) else (

+  rem echo this script does not work with cmd.exe. please, install bash

+  echo unknown

+  exit 1

+)
\ No newline at end of file