Skip to content

Commit d4bdc1c

Browse files
committed
registry valuename and valuedata no longer mandatory for setup generation
1 parent 52d6a51 commit d4bdc1c

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

src/main/java/io/github/fvarrui/javapackager/packagers/GenerateSetup.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22

33
import java.io.File;
44

5-
import org.apache.commons.lang3.StringUtils;
6-
75
import io.github.fvarrui.javapackager.model.Platform;
8-
import io.github.fvarrui.javapackager.model.Registry;
96
import io.github.fvarrui.javapackager.utils.CommandUtils;
107
import io.github.fvarrui.javapackager.utils.FileUtils;
118
import io.github.fvarrui.javapackager.utils.Logger;
@@ -44,12 +41,6 @@ protected File doApply(WindowsPackager packager) throws Exception {
4441
String name = packager.getName();
4542
File outputDirectory = packager.getOutputDirectory();
4643
String version = packager.getVersion();
47-
Registry registry = packager.getWinConfig().getRegistry();
48-
49-
// checks if registry entries' names are not empy
50-
if (registry.getEntries().stream().anyMatch(e -> StringUtils.isBlank(e.getKey()) || StringUtils.isBlank(e.getValueName()))) {
51-
throw new Exception("One or more registry entries have no key and/or value name");
52-
}
5344

5445
// copies ico file to assets folder
5546
FileUtils.copyFileToFolder(iconFile, assetsFolder);

src/main/resources/windows/iss.vtl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
6868
[Registry]
6969
#if ($info.winConfig.registry)
7070
#foreach ($entry in $info.winConfig.registry.entries)
71-
Root: ${entry.root}; Subkey: "${entry.subkey}"; ValueType: ${entry.valueTypeAsInnoSetupString}; ValueName: "${entry.valueName}"; ValueData: "${entry.valueData}"; Flags: uninsdeletevalue
71+
Root: ${entry.root}; Subkey: "${entry.subkey}"; ValueType: ${entry.valueTypeAsInnoSetupString}; ValueName: "$!{entry.valueName}"; ValueData: "$!{entry.valueData}"; Flags: uninsdeletevalue
7272
#end
7373
#end
7474
#foreach ($fileAssociation in $info.fileAssociations)

0 commit comments

Comments
 (0)