Merge pull request #369 from henrikengstrom/wip/h3nk3-windows-bat

Handles OpenJDK version output on Windows
sbt · Oct 4, 2014 · 157f858 · 157f858
2 parents bf6373d + ed9c8a5
commit 157f858
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/resources/com/typesafe/sbt/packager/archetypes/bat-template b/src/main/resources/com/typesafe/sbt/packager/archetypes/bat-template
@@ -42,7 +42,8 @@ if "%_JAVACMD%"=="" set _JAVACMD=java
 
 rem Detect if this java is ok to use.
 for /F %%j in ('"%_JAVACMD%" -version  2^>^&1') do (
-  if %%~j==Java set JAVAINSTALLED=1
+  if %%~j==java set JAVAINSTALLED=1
+  if %%~j==openjdk set JAVAINSTALLED=1
 )
 
 rem BAT has no logical or, so we do it OLD SCHOOL! Oppan Redmond Style