Skip to content

Commit 154b7a6

Browse files
committed
U change nebula-package-plugin with redline-rpm library
1 parent 9d398a4 commit 154b7a6

File tree

2 files changed

+12
-23
lines changed

2 files changed

+12
-23
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ dependencies {
5454
implementation 'io.github.fvarrui:gradle-launch4j:2.4.7'
5555
implementation 'org.vafer:jdeb:1.9'
5656
implementation 'net.jsign:jsign-core:3.1'
57-
implementation 'com.netflix.nebula:gradle-ospackage-plugin:8.5.6'
57+
implementation 'org.redline-rpm:redline:1.2.10'
5858

5959
testImplementation 'junit:junit:4.12'
6060

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
package io.github.fvarrui.javapackager.gradle;
22

33
import java.io.File;
4-
import java.util.UUID;
54

6-
import org.gradle.api.tasks.bundling.Zip;
5+
import org.redline_rpm.Builder;
76
import org.redline_rpm.header.Architecture;
87
import org.redline_rpm.header.Os;
9-
10-
import com.netflix.gradle.plugins.rpm.Rpm;
8+
import org.redline_rpm.header.RpmType;
119

1210
import io.github.fvarrui.javapackager.packagers.ArtifactGenerator;
13-
import io.github.fvarrui.javapackager.packagers.Context;
1411
import io.github.fvarrui.javapackager.packagers.LinuxPackager;
1512
import io.github.fvarrui.javapackager.packagers.Packager;
16-
import io.github.fvarrui.javapackager.utils.Logger;
1713

1814
/**
1915
* Creates a RPM package file including all app folder's content only for
@@ -42,24 +38,17 @@ protected File doApply(Packager packager) throws Exception {
4238
String organizationName = linuxPackager.getOrganizationName();
4339
File outputDirectory = linuxPackager.getOutputDirectory();
4440

45-
Rpm rpmTask = createTask();
46-
rpmTask.setPackageName(name);
47-
rpmTask.setPackageDescription(description);
48-
rpmTask.setSourcePackage("");
49-
rpmTask.setRelease("1");
50-
rpmTask.setEpoch(0);
51-
rpmTask.setArch(Architecture.X86_64);
52-
rpmTask.setPackager(organizationName);
53-
rpmTask.setOs(Os.LINUX);
54-
rpmTask.into("/opt/" + name);
55-
rpmTask.from(appFolder);
56-
rpmTask.getActions().forEach(action -> action.execute(rpmTask));
41+
Builder builder = new Builder();
42+
builder.setType(RpmType.BINARY);
43+
builder.setPlatform(Architecture.X86_64, Os.LINUX);
44+
builder.setPackage(name, version, "1");
45+
builder.setPackager(organizationName);
46+
builder.setDescription(description);
47+
builder.setPrefixes("/opt/" + name);
48+
builder.addDirectory(appFolder.getAbsolutePath());
49+
builder.build(outputDirectory);
5750

5851
return new File(outputDirectory, name + "_" + version + ".rpm");
5952
}
6053

61-
private Rpm createTask() {
62-
return Context.getGradleContext().getProject().getTasks().create("createRpm_" + UUID.randomUUID(), Rpm.class);
63-
}
64-
6554
}

0 commit comments

Comments
 (0)