Skip to content
This repository was archived by the owner on Sep 8, 2022. It is now read-only.

manually check for a .exe #71

Merged
merged 1 commit into from
Jan 17, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions src/main/scala/scala/tools/partest/PartestDefaults.scala
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@ object PartestDefaults {

// probe for the named executable
private def jdkexec(name: String): Option[String] = {
import scala.reflect.io.Path, Path._
Some(Path(jdkHome) / "bin") filter (_.isDirectory) flatMap { p =>
val candidates = (p walkFilter { e => (e.name == name || e.name.startsWith(s"$name.")) && e.jfile.canExecute }).toList
(candidates find (_.name == name) orElse candidates.headOption) map (_.path)
}
import scala.reflect.io.Path, Path._, scala.tools.nsc.Properties.isWin
(Path(jdkHome) / "bin").walk.find(e => e.name == name || isWin && e.name.equalsIgnoreCase(s"$name.exe")).map(_.path)
}
}