|
|
@ -64,9 +64,6 @@ class FS_Win32 extends FS { |
|
|
|
&& StringUtils.toLowerCase(osDotName).indexOf("windows") != -1; |
|
|
|
&& StringUtils.toLowerCase(osDotName).indexOf("windows") != -1; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private File gitPrefix; |
|
|
|
|
|
|
|
private boolean gitPrefixEvaluated; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public boolean supportsExecute() { |
|
|
|
public boolean supportsExecute() { |
|
|
|
return false; |
|
|
|
return false; |
|
|
|
} |
|
|
|
} |
|
|
@ -85,27 +82,21 @@ class FS_Win32 extends FS { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public File gitPrefix() { |
|
|
|
protected File discoverGitPrefix() { |
|
|
|
if (gitPrefixEvaluated) |
|
|
|
|
|
|
|
return gitPrefix; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
String path = SystemReader.getInstance().getenv("PATH"); |
|
|
|
String path = SystemReader.getInstance().getenv("PATH"); |
|
|
|
File gitExe = searchPath(path, "git.exe", "git.cmd"); |
|
|
|
File gitExe = searchPath(path, "git.exe", "git.cmd"); |
|
|
|
if (gitExe != null) |
|
|
|
if (gitExe != null) |
|
|
|
gitPrefix = gitExe.getParentFile().getParentFile(); |
|
|
|
return gitExe.getParentFile().getParentFile(); |
|
|
|
else { |
|
|
|
|
|
|
|
// This isn't likely to work, if bash is in $PATH, git should
|
|
|
|
|
|
|
|
// also be in $PATH. But its worth trying.
|
|
|
|
|
|
|
|
//
|
|
|
|
|
|
|
|
String w = readPipe(userHome(), //
|
|
|
|
|
|
|
|
new String[] { "bash", "--login", "-c", "which git" }, //
|
|
|
|
|
|
|
|
Charset.defaultCharset().name()); |
|
|
|
|
|
|
|
if (w != null) |
|
|
|
|
|
|
|
gitPrefix = new File(w).getParentFile().getParentFile(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gitPrefixEvaluated = true; |
|
|
|
// This isn't likely to work, if bash is in $PATH, git should
|
|
|
|
return gitPrefix; |
|
|
|
// also be in $PATH. But its worth trying.
|
|
|
|
|
|
|
|
//
|
|
|
|
|
|
|
|
String w = readPipe(userHome(), //
|
|
|
|
|
|
|
|
new String[] { "bash", "--login", "-c", "which git" }, //
|
|
|
|
|
|
|
|
Charset.defaultCharset().name()); |
|
|
|
|
|
|
|
if (w != null) |
|
|
|
|
|
|
|
return new File(w).getParentFile().getParentFile(); |
|
|
|
|
|
|
|
return null; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|