Skip to content

Commit a4b2372

Browse files
committed
Update GenerateDeb.java
1 parent 336fe11 commit a4b2372

File tree

1 file changed

+24
-23
lines changed

1 file changed

+24
-23
lines changed

src/main/java/io/github/fvarrui/javapackager/gradle/GenerateDeb.java

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -67,32 +67,33 @@ public File apply(Packager packager) throws Exception {
6767
// installation destination
6868
debTask.into("/opt/" + name);
6969

70-
// // includes app folder files, except executable file and jre/bin/java
71-
// debTask.from(appFolder, c -> {
72-
// c.into(".");
73-
// c.exclude(executable.getName());
74-
// if (bundleJre) {
75-
// c.exclude(jreDirectoryName + "/bin/java");
76-
// }
77-
// });
78-
//
79-
// // executable
80-
// debTask.from(executable, c -> {
81-
// c.into(".");
82-
// c.setFileMode(0755);
83-
// });
84-
//
85-
// // java binary file
86-
// if (bundleJre) {
87-
// debTask.from(new File(appFolder, jreDirectoryName + "/bin/java"), c -> {
88-
// c.into(".");
89-
// c.setFileMode(0755);
90-
// });
91-
// }
70+
// includes app folder files, except executable file and jre/bin/java
71+
debTask.from(appFolder.getParentFile(), c -> {
72+
c.include(appFolder.getName() + "/**");
73+
c.exclude(appFolder.getName() + "/" + executable.getName());
74+
if (bundleJre) {
75+
c.exclude(appFolder.getName() + "/" + jreDirectoryName + "/bin/java");
76+
}
77+
});
78+
79+
// executable
80+
debTask.from(appFolder.getParentFile(), c -> {
81+
c.include(appFolder.getName() + "/" + executable.getName());
82+
c.setFileMode(0755);
83+
});
84+
85+
// java binary file
86+
if (bundleJre) {
87+
debTask.from(appFolder.getParentFile(), c -> {
88+
c.include(appFolder.getName() + "/" + jreDirectoryName + "/bin/java");
89+
c.setFileMode(0755);
90+
});
91+
}
9292

9393
// desktop file
94-
debTask.from(desktopFile, c -> {
94+
debTask.from(desktopFile.getParentFile(), c -> {
9595
c.into("/usr/share/applications");
96+
c.include(desktopFile.getName());
9697
});
9798

9899
// symbolic link in /usr/local/bin to app binary

0 commit comments

Comments
 (0)