Skip to content

fix hdiutil image creation on aarch64 #186

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

Merged
merged 1 commit into from
Apr 5, 2022
Merged

fix hdiutil image creation on aarch64 #186

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
25 changes: 19 additions & 6 deletions src/main/java/io/github/fvarrui/javapackager/packagers/GenerateDmg.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,21 @@ protected File doApply(MacPackager packager) throws Exception {
Logger.info("Copying icon file: " + iconFile.getAbsolutePath());
File volumeIcon = (macConfig.getVolumeIcon() != null) ? macConfig.getVolumeIcon() : iconFile;
FileUtils.copyFileToFile(volumeIcon, new File(appFolder, ".VolumeIcon.icns"));




// creates image
Logger.info("Creating image: " + tempDmgFile.getAbsolutePath());
execute("hdiutil", "create", "-srcfolder", appFolder, "-volname", volumeName, "-ov", "-fs", "HFS+", "-format", "UDRW", tempDmgFile);
String osArchitecture = System.getProperty("os.arch");
if (osArchitecture.toLowerCase().equals("aarch64")) {

execute("hdiutil", "create", "-srcfolder", appFolder, "-volname", volumeName, "-ov", "-fs", "APFS", "-format", "UDRW", tempDmgFile);

} else {

execute("hdiutil", "create", "-srcfolder", appFolder, "-volname", volumeName, "-ov", "-fs", "HFS+", "-format", "UDRW", tempDmgFile);

}

if (mountFolder.exists()) {
Logger.info("Unmounting volume: " + mountFolder);
Expand Down Expand Up @@ -126,10 +137,12 @@ protected File doApply(MacPackager packager) throws Exception {
// makes sure it's not world writeable and user readable
Logger.info("Fixing permissions...");
execute("chmod", "-Rf", "u+r,go-w", mountFolder);

// makes the top window open itself on mount:
Logger.info("Blessing ...");
execute("bless", "--folder", mountFolder, "--openfolder", mountFolder);

if (!osArchitecture.toLowerCase().equals("aarch64")) {
// makes the top window open itself on mount:
Logger.info("Blessing ...");
execute("bless", "--folder", mountFolder, "--openfolder", mountFolder);
}

// tells the volume that it has a special file attribute
execute("SetFile", "-a", "C", mountFolder);
Expand Down