Skip to content
Permalink
Browse files
Merge pull request #657 from ssogabe/JENKINS-5408
[FIXED JENKINS-5408] Quoting Issue with JDK Installer with Windows Slave
  • Loading branch information
ssogabe committed Apr 11, 2013
2 parents d33e22d + fd4ccc1 commit c86b6d7055a03db1add27acd4a0159ad7d024c17
Showing with 2 additions and 2 deletions.
  1. +2 −2 core/src/main/java/hudson/tools/JDKInstaller.java
@@ -227,10 +227,10 @@ I tried to locate exactly how InstallShield parses the arguments (and why it use
ArgumentListBuilder args = new ArgumentListBuilder();
args.add(jdkBundle);
if (isJava15() || isJava14()) {
args.add("/s","/v/qn REBOOT=ReallySuppress INSTALLDIR=\\\""+ expectedLocation +"\\\" /L \\\""+logFile+"\\\"");
args.add("/s","/v/qn REBOOT=ReallySuppress INSTALLDIR=\""+ expectedLocation +"\" /L \""+logFile+"\"");
} else {
// modern version supports arguments in more sane format.
args.add("/s","/v","/qn","/L","\\\""+logFile+"\\\"","REBOOT=ReallySuppress","INSTALLDIR=\\\""+ expectedLocation+"\\\"");
args.add("/s","/v","/qn","/L","\""+logFile+"\"","REBOOT=ReallySuppress","INSTALLDIR=\""+ expectedLocation+"\"");
}
// according to http://community.acresso.com/showthread.php?t=83301, \" is the trick to quote values with whitespaces.
// Oh Windows, oh windows, why do you have to be so difficult?

0 comments on commit c86b6d7

Please sign in to comment.