From ed9c8a5b6a5cdb761a621adfee4556b566dc8ff9 Mon Sep 17 00:00:00 2001 From: Henrik Engstrom Date: Fri, 3 Oct 2014 17:15:51 -0400 Subject: [PATCH] Handles OpenJDK version output on Windows --- .../com/typesafe/sbt/packager/archetypes/bat-template | 3 ++- 1 file changed, 2 insertions(+), 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 index e093b922b..8c4b3a969 100644 --- 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