[Fix JENKINS-29813] Use Bourne shell rather than bash for ASKPASS answer

Bourne shell does not allow a variable to be declared and exported with a single command. This uses a statement to declare and a statement to export.
jenkinsci · Aug 6, 2015 · 4a48601 · 4a48601
1 parent 938f9a7
commit 4a48601
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java b/src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java
@@ -1562,7 +1562,10 @@ private File createUnixGitSSH(File key, String user) throws IOException {
         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("if [ -z \"${DISPLAY}\" ]; then");
+        w.println("  DISPLAY=:123.456");
+        w.println("  export DISPLAY");
+        w.println("fi");
         w.println("ssh -i \"" + key.getAbsolutePath() + "\" -l \"" + user + "\" -o StrictHostKeyChecking=no \"$@\"");
         w.close();
         ssh.setExecutable(true);