Merge pull request #168 from thomasgl-orange/JENKINS-20879

JENKINS-20879 - make sure $SSH_ASKPASS is not ignored on Unix. Does not fix the passphrase protected private keys on Windows, just on Unix machines.
jenkinsci · May 16, 2015 · 0e67e3d · 0e67e3d
2 parents 2f0cd5d + 21bc735
commit 0e67e3d
Showing 1 changed file with 2 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
@@ -1530,6 +1530,8 @@ private File createUnixGitSSH(File key) throws IOException {
         File ssh = File.createTempFile("ssh", ".sh");
         PrintWriter w = new PrintWriter(ssh);
         w.println("#!/bin/sh");
+        // ${SSH_ASKPASS} might be ignored if ${DISPLAY} is not set
+        w.println("[ -z \"${DISPLAY}\" ] && export DISPLAY=:123.456");
         w.println("ssh -i \"" + key.getAbsolutePath() + "\" -o StrictHostKeyChecking=no \"$@\"");
         w.close();
         ssh.setExecutable(true);