equal
deleted
inserted
replaced
454 if (licenseFile != null) { |
454 if (licenseFile != null) { |
455 // need to copy license file to the working directory and convert to rtf if needed |
455 // need to copy license file to the working directory and convert to rtf if needed |
456 File lfile = new File(licenseFile); |
456 File lfile = new File(licenseFile); |
457 File destFile = new File(CONFIG_ROOT.fetchFrom(params), |
457 File destFile = new File(CONFIG_ROOT.fetchFrom(params), |
458 lfile.getName()); |
458 lfile.getName()); |
|
459 |
459 IOUtils.copyFile(lfile, destFile); |
460 IOUtils.copyFile(lfile, destFile); |
460 destFile.setWritable(true); |
461 destFile.setWritable(true); |
461 ensureByMutationFileIsRTF(destFile); |
462 ensureByMutationFileIsRTF(destFile); |
462 } |
463 } |
463 |
464 |
664 |
665 |
665 if (MSI_SYSTEM_WIDE.fetchFrom(params)) { |
666 if (MSI_SYSTEM_WIDE.fetchFrom(params)) { |
666 data.put("JpIsSystemWide", "yes"); |
667 data.put("JpIsSystemWide", "yes"); |
667 } |
668 } |
668 |
669 |
669 if (LICENSE_FILE.fetchFrom(params) != null) { |
670 String licenseFile = LICENSE_FILE.fetchFrom(params); |
670 data.put("JpLicenseRtf", LICENSE_FILE.fetchFrom(params)); |
671 if (licenseFile != null) { |
|
672 String lname = new File(licenseFile).getName(); |
|
673 File destFile = new File(CONFIG_ROOT.fetchFrom(params), lname); |
|
674 data.put("JpLicenseRtf", destFile.getAbsolutePath()); |
671 } |
675 } |
672 |
676 |
673 // Copy CA dll to include with installer |
677 // Copy CA dll to include with installer |
674 if (INSTALLDIR_CHOOSER.fetchFrom(params)) { |
678 if (INSTALLDIR_CHOOSER.fetchFrom(params)) { |
675 data.put("JpInstallDirChooser", "yes"); |
679 data.put("JpInstallDirChooser", "yes"); |