Skip to content

Fix zipball/tarball name ignoring the name and version properties #489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
commi wants to merge 1 commit into
base: devel
Choose a base branch
from
Open

Fix zipball/tarball name ignoring the name and version properties #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/main/java/io/github/fvarrui/javapackager/maven/CreateTarball.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import static org.twdata.maven.mojoexecutor.MojoExecutor.version;

import java.io.File;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;

import io.github.fvarrui.javapackager.model.Platform;
import io.github.fvarrui.javapackager.packagers.ArtifactGenerator;
Expand All @@ -35,6 +37,8 @@ public boolean skip(Packager packager) {
protected File doApply(Packager packager) {

File assetsFolder = packager.getAssetsFolder();
String name = packager.getName();
String version = packager.getVersion();
Platform platform = packager.getPlatform();
File outputDirectory = packager.getOutputDirectory();

Expand Down Expand Up @@ -69,11 +73,11 @@ protected File doApply(Packager packager) {
File finalFile = new File(outputDirectory, finalName + "." + format);

// get desired file name
String tarName = packager.getTarballName() != null ? packager.getTarballName() : finalName + "-" + platform;
String tarName = packager.getTarballName() != null ? packager.getTarballName() : name + "-" + version + "-" + platform;
File tarFile = new File(outputDirectory, tarName + "." + format);

// rename generated to desired
finalFile.renameTo(tarFile);
// rename generated to desired, replacing an archive left by a previous build
Files.move(finalFile.toPath(), tarFile.toPath(), StandardCopyOption.REPLACE_EXISTING);

return tarFile;

Expand Down
10 changes: 7 additions & 3 deletions src/main/java/io/github/fvarrui/javapackager/maven/CreateZipball.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import static org.twdata.maven.mojoexecutor.MojoExecutor.version;

import java.io.File;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;

import io.github.fvarrui.javapackager.model.Platform;
import io.github.fvarrui.javapackager.packagers.ArtifactGenerator;
Expand All @@ -35,6 +37,8 @@ public boolean skip(Packager packager) {
protected File doApply(Packager packager) {

File assetsFolder = packager.getAssetsFolder();
String name = packager.getName();
String version = packager.getVersion();
Platform platform = packager.getPlatform();
File outputDirectory = packager.getOutputDirectory();

Expand Down Expand Up @@ -69,11 +73,11 @@ protected File doApply(Packager packager) {
File finalFile = new File(outputDirectory, finalName + "." + format);

// gets desired file name
String zipName = packager.getZipballName() != null ? packager.getZipballName() : finalName + "-" + platform;
String zipName = packager.getZipballName() != null ? packager.getZipballName() : name + "-" + version + "-" + platform;
File zipFile = new File(outputDirectory, zipName + "." + format);

// rename generated to desired
finalFile.renameTo(zipFile);
// rename generated to desired, replacing an archive left by a previous build
Files.move(finalFile.toPath(), zipFile.toPath(), StandardCopyOption.REPLACE_EXISTING);

return zipFile;

Expand Down