Check for ssh.exe in usr/bin in addition to bin

[Fix JENKINS-30045] Windows git 2.5.0 can't find ssh [Fix JENKINS-30032] Windows git 2.5.0 can't find ssh
jenkinsci · Aug 20, 2015 · b6fe319 · b6fe319
1 parent 6271ad9
commit b6fe319
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java b/src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java
@@ -1529,12 +1529,20 @@ private File getSSHExeFromGitExeParentDir(String userGitExe) {
         if (sshexe != null && sshexe.exists()) {
             return sshexe;
         }
+        sshexe = getFileFromEnv("ProgramFiles", "\\Git\\usr\\bin\\ssh.exe");
+        if (sshexe != null && sshexe.exists()) {
+            return sshexe;
+        }
 
         // Check Program Files(x86) for 64 bit computer
         sshexe = getFileFromEnv("ProgramFiles(x86)", "\\Git\\bin\\ssh.exe");
         if (sshexe != null && sshexe.exists()) {
             return sshexe;
         }
+        sshexe = getFileFromEnv("ProgramFiles(x86)", "\\Git\\usr\\bin\\ssh.exe");
+        if (sshexe != null && sshexe.exists()) {
+            return sshexe;
+        }
 
         // Search for an ssh.exe near the git executable.
         sshexe = getSSHExeFromGitExeParentDir(gitExe);
@@ -1552,6 +1560,10 @@ private File getSSHExeFromGitExeParentDir(String userGitExe) {
             if (sshexe != null && sshexe.exists()) {
                 return sshexe;
             }
+            sshexe = getSSHExeFromGitExeParentDir(gitPath.replace("/cmd/", "/usr/bin/").replace("\\cmd\\", "\\usr\\bin\\"));
+            if (sshexe != null && sshexe.exists()) {
+                return sshexe;
+            }
         }
 
         throw new RuntimeException("ssh executable not found. The git plugin only supports official git client http://git-scm.com/download/win");