Skip to content

Check if system Java is installed #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonpryor merged 1 commit into from
Dec 11, 2018
Merged

Check if system Java is installed #52

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 21 additions & 0 deletions src/Xamarin.Android.Tools.AndroidSdk/JdkInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,23 @@ Dictionary<string, List<string>> GetJavaProperties ()
return GetJavaProperties (ProcessUtils.FindExecutablesInDirectory (Path.Combine (HomePath, "bin"), "java").First ());
}

static bool AnySystemJavasInstalled ()
{
if (OS.IsMac) {
string path = Path.Combine (Path.DirectorySeparatorChar + "System", "Library", "Java", "JavaVirtualMachines");
if (!Directory.Exists (path)) {
return false;
}

string[] dirs = Directory.GetDirectories (path);
if (dirs == null || dirs.Length == 0) {
return false;
}
}

return true;
}

static Dictionary<string, List<string>> GetJavaProperties (string java)
{
var javaProps = new ProcessStartInfo {
Expand All @@ -209,6 +226,10 @@ static Dictionary<string, List<string>> GetJavaProperties (string java)

var props = new Dictionary<string, List<string>> ();
string curKey = null;

if (!AnySystemJavasInstalled () && (java == "/usr/bin/java" || java == "java"))
return props;

ProcessUtils.Exec (javaProps, (o, e) => {
const string ContinuedValuePrefix = " ";
const string NewValuePrefix = " ";
Expand Down