Skip to content

Commit 2a70b63

Browse files
committed
U fix rpm renaming
1 parent 34d5dcf commit 2a70b63

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ private void generateRpmPackage() throws MojoExecutionException {
273273
}
274274

275275
// rename generated rpm package
276-
File rpmFile = new File(assetsFolder, name + "-" + version + "-2.x86_64.rpm");
276+
File rpmFile = new File(outputDirectory, name + "-" + version + "-2.x86_64.rpm");
277277
String newName = name + "_" + version + ".rpm";
278278
FileUtils.rename(rpmFile, newName);
279279

src/main/java/fvarrui/maven/plugin/javapackager/utils/FileUtils.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import org.apache.commons.io.IOUtils;
1919
import org.apache.commons.lang.StringUtils;
20-
import org.apache.commons.lang.SystemUtils;
2120
import org.apache.maven.plugin.MojoExecutionException;
2221

2322

@@ -153,14 +152,7 @@ public static void removeFolder(File folder) throws MojoExecutionException {
153152

154153
public static void rename(File file, String newName) throws MojoExecutionException {
155154
Logger.info("Changing name of [" + file + "] to [" + newName + "]");
156-
try {
157-
if (SystemUtils.IS_OS_LINUX)
158-
ProcessUtils.execute("mv", file, newName);
159-
else
160-
file.renameTo(new File(newName)); // FIXME this doesn't work on linux, I don't know why
161-
} catch (MojoExecutionException e) {
162-
throw new MojoExecutionException("File [" + file + "] couldn't be renamed to [" + newName + "]", e);
163-
}
155+
file.renameTo(new File(file.getParentFile(), newName));
164156
}
165157

166158
}

0 commit comments

Comments
 (0)