Skip to content

Commit 5ddaf15

Browse files
committed
U fix bug with multiple executions on linux
1 parent 204a582 commit 5ddaf15

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
2-
#Wed Mar 04 10:45:59 WET 2020
2+
#Wed Mar 04 10:56:32 WET 2020
33
javapackager-0.8.9.jar>=
44
javapackager-0.8.9.pom>=
-25 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0b11a39b7f5da43b4a8741963fd7dca1
1+
81431395ae9bacf6546889e8b324ab77
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
538a4c9ca2b5af97814d6df4694ef8967c4b1363
1+
ac6f4a9a67c9971becc9c4c1394d8d3c034faa60

releases/fvarrui/maven/javapackager/maven-metadata-local.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
<version>0.8.8</version>
2121
<version>0.8.9</version>
2222
</versions>
23-
<lastUpdated>20200304104559</lastUpdated>
23+
<lastUpdated>20200304105632</lastUpdated>
2424
</versioning>
2525
</metadata>

src/main/java/fvarrui/maven/plugin/javapackager/PackageMojo.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -627,26 +627,26 @@ private void generateDebPackage() throws MojoExecutionException {
627627
goal("jdeb"),
628628
configuration(
629629
element("controlDir", controlFile.getParentFile().getAbsolutePath()),
630-
element("deb", outputDirectory.getAbsolutePath() + "/${project.name}_${project.version}.deb"),
630+
element("deb", outputDirectory.getAbsolutePath() + "/" + debFile.getName()),
631631
element("dataSet",
632632
/* app folder files, except executable file and jre/bin/java */
633633
element("data",
634634
element("type", "directory"),
635635
element("src", appFolder.getAbsolutePath()),
636636
element("mapper",
637637
element("type", "perm"),
638-
element("prefix", "/opt/${project.name}")
638+
element("prefix", "/opt/" + name)
639639
),
640640
element("excludes", executable.getName() + "," + "jre/bin/java")
641641
),
642642
/* executable */
643643
element("data",
644644
element("type", "file"),
645-
element("src", appFolder.getAbsolutePath() + "/${project.name}"),
645+
element("src", appFolder.getAbsolutePath() + "/" + name),
646646
element("mapper",
647647
element("type", "perm"),
648648
element("filemode", "755"),
649-
element("prefix", "/opt/${project.name}")
649+
element("prefix", "/opt/" + name)
650650
)
651651
),
652652
/* desktop file */
@@ -665,14 +665,14 @@ private void generateDebPackage() throws MojoExecutionException {
665665
element("mapper",
666666
element("type", "perm"),
667667
element("filemode", "755"),
668-
element("prefix", "/opt/${project.name}/jre/bin")
668+
element("prefix", "/opt/" + name + "/jre/bin")
669669
)
670670
),
671671
/* symbolic link in /usr/local/bin to app binary */
672672
element("data",
673673
element("type", "link"),
674-
element("linkTarget", "/opt/${project.name}/${project.name}"),
675-
element("linkName", "/usr/local/bin/${project.name}"),
674+
element("linkTarget", "/opt/" + name + "/" + name),
675+
element("linkName", "/usr/local/bin/" + name),
676676
element("symlink", "true"),
677677
element("mapper",
678678
element("type", "perm"),

0 commit comments

Comments
 (0)