Skip to content

Commit a7d532a

Browse files
committed
Update PackageMojo.java
1 parent 56f0ff9 commit a7d532a

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

src/main/java/io/github/fvarrui/javapackager/PackageMojo.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -470,10 +470,7 @@ private void generateRpmPackage() throws MojoExecutionException {
470470
// generates desktop file from velocity template
471471
File desktopFile = new File(assetsFolder, name + ".desktop");
472472
VelocityUtils.render("linux/desktop.vtl", desktopFile, info);
473-
474-
// generates deb control file from velocity template
475-
File controlFile = new File(assetsFolder, "control");
476-
VelocityUtils.render("linux/control.vtl", controlFile, info);
473+
FileUtils.copyFileToFolder(desktopFile, appFolder);
477474

478475
// determines xpm icon file location or takes default one
479476
File xpmIcon = new File(iconFile.getParentFile(), FilenameUtils.removeExtension(iconFile.getName()) + ".xpm");
@@ -501,7 +498,6 @@ private void generateRpmPackage() throws MojoExecutionException {
501498
element("needarch", "true"),
502499
element("defaultDirmode", "755"),
503500
element("defaultFilemode", "644"),
504-
element("needarch", "true"),
505501
element("copyTo", rpmFile.getAbsolutePath()),
506502
element("mappings",
507503
/* app folder files, except executable file and jre/bin/java */
@@ -535,8 +531,8 @@ private void generateRpmPackage() throws MojoExecutionException {
535531
element("mapping",
536532
element("directory", "/usr/share/applications"),
537533
element("sources",
538-
element("source",
539-
element("location", desktopFile.getAbsolutePath())
534+
element("softlinkSource",
535+
element("location", "/opt/" + name + "/" + desktopFile.getName())
540536
)
541537
)
542538
),

0 commit comments

Comments
 (0)