Skip to content

Commit 673bf6b

Browse files
committed
U fix unix newline style
1 parent 0daa6bc commit 673bf6b

File tree

3 files changed

+22
-2
lines changed

3 files changed

+22
-2
lines changed

src/main/java/io/github/fvarrui/javapackager/packagers/MacPackager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public File doCreateApp() throws MojoExecutionException {
8585

8686
// copies universalJavaApplicationStub startup file to boot java app
8787
File appStubFile = new File(macOSFolder, "universalJavaApplicationStub");
88-
FileUtils.copyResourceToFile("/mac/universalJavaApplicationStub", appStubFile);
88+
FileUtils.copyResourceToFile("/mac/universalJavaApplicationStub", appStubFile, true);
8989
appStubFile.setExecutable(true);
9090

9191
// creates and write the Info.plist file

src/main/java/io/github/fvarrui/javapackager/utils/FileUtils.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@
1414
import java.io.IOException;
1515
import java.io.InputStream;
1616
import java.net.URL;
17+
import java.nio.charset.Charset;
1718
import java.nio.file.Files;
1819
import java.util.Arrays;
1920
import java.util.List;
21+
import java.util.function.Function;
2022
import java.util.regex.Pattern;
2123
import java.util.stream.Collectors;
2224

@@ -143,10 +145,28 @@ private static void copyStreamToFile(InputStream is, File dest) throws MojoExecu
143145
}
144146
}
145147

148+
public static void copyResourceToFile(String resource, File dest, boolean unixStyleNewLines) throws MojoExecutionException {
149+
copyResourceToFile(resource, dest);
150+
if (unixStyleNewLines) {
151+
try {
152+
processFileContent(dest, c -> c.replaceAll("\\r\\n", "\n").replaceAll("\\r", "\n"));
153+
} catch (IOException e) {
154+
throw new MojoExecutionException(e.getMessage(), e);
155+
}
156+
}
157+
}
158+
159+
public static void processFileContent(File dest, Function<String, String> function) throws IOException {
160+
String content = org.apache.commons.io.FileUtils.readFileToString(dest, Charset.forName("UTF-8"));
161+
content = function.apply(content);
162+
org.apache.commons.io.FileUtils.writeStringToFile(dest, content, Charset.forName("UTF-8"));
163+
}
164+
146165
public static void copyResourceToFile(String resource, File dest) throws MojoExecutionException {
147166
Logger.info("Copying resource [" + resource + "] to file [" + dest + "]");
148167
copyStreamToFile(FileUtils.class.getResourceAsStream(resource), dest);
149168
}
169+
150170

151171
public static void createSymlink(File link, File target) throws MojoExecutionException {
152172
Logger.info("Creating symbolic link [" + link + "] to [" + target + "]");

src/main/java/io/github/fvarrui/javapackager/utils/VelocityUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public static void render(String templatePath, File output, Object info) throws
4747
}
4848
}
4949

50-
public static String render(String templatePath, Object info) throws MojoExecutionException {
50+
private static String render(String templatePath, Object info) throws MojoExecutionException {
5151
VelocityContext context = new VelocityContext();
5252
context.put("features", new ArrayList<String>());
5353
context.put("GUID", UUID.class);

0 commit comments

Comments
 (0)