mirrors/Mist
1
0
Fork 0
mirror of https://github.com/ninxsoft/Mist.git synced 2025-05-19 01:35:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix bootable ISOs by reverting shrink logic (#82)

Browse source
This commit is contained in:
Nindi Gill 2023-08-23 22:15:51 +10:00 • committed by GitHub
parent 55ad1f84ce
commit a82a9ebb65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mist/Helpers/DiskImageCreator.swift
View file

@ -24,9 +24,7 @@ struct DiskImageCreator {
"-fs", "JHFS+", "-fs", "JHFS+",
"-layout", "SPUD", "-layout", "SPUD",
"-size", "\(size)g", "-size", "\(size)g",
"-volname", url "-volname", url.lastPathComponent.replacingOccurrences(of: ".dmg", with: ""),
.lastPathComponent.replacingOccurrences(of: ".resized", with: "")
.replacingOccurrences(of: ".dmg", with: ""),
url.path url.path
] ]
try await create(url, with: arguments) try await create(url, with: arguments)
@ -45,9 +43,7 @@ struct DiskImageCreator {
"hdiutil", "create", "hdiutil", "create",
"-fs", "HFS+", "-fs", "HFS+",
"-srcFolder", source.path, "-srcFolder", source.path,
"-volname", url "-volname", url.lastPathComponent.replacingOccurrences(of: ".dmg", with: ""),
.lastPathComponent.replacingOccurrences(of: ".resized", with: "")
.replacingOccurrences(of: ".dmg", with: ""),
url.path url.path
] ]
try await create(url, with: arguments) try await create(url, with: arguments)

11
Mist/Helpers/TaskManager.swift
View file

@ -430,7 +430,6 @@ class TaskManager: ObservableObject {
let temporaryImageURL: URL = temporaryDirectoryURL.appendingPathComponent("\(installer.id).dmg") let temporaryImageURL: URL = temporaryDirectoryURL.appendingPathComponent("\(installer.id).dmg")
let createInstallMediaURL: URL = installer.temporaryInstallerURL.appendingPathComponent("/Contents/Resources/createinstallmedia") let createInstallMediaURL: URL = installer.temporaryInstallerURL.appendingPathComponent("/Contents/Resources/createinstallmedia")
let temporaryResizedImageURL: URL = temporaryDirectoryURL.appendingPathComponent("\(installer.id).resized.dmg")
let temporaryCDRURL: URL = temporaryDirectoryURL.appendingPathComponent("\(installer.id).cdr") let temporaryCDRURL: URL = temporaryDirectoryURL.appendingPathComponent("\(installer.id).cdr")
let isoURL: URL = destinationURL.appendingPathComponent(filename.stringWithSubstitutions(name: installer.name, version: installer.version, build: installer.build)) let isoURL: URL = destinationURL.appendingPathComponent(filename.stringWithSubstitutions(name: installer.name, version: installer.version, build: installer.build))
@ -444,9 +443,6 @@ class TaskManager: ObservableObject {
MistTask(type: .create, description: "macOS Installer in temporary Disk Image") { MistTask(type: .create, description: "macOS Installer in temporary Disk Image") {
try await InstallMediaCreator.create(createInstallMediaURL, mountPoint: installer.temporaryISOMountPointURL, sierraOrOlder: installer.sierraOrOlder) try await InstallMediaCreator.create(createInstallMediaURL, mountPoint: installer.temporaryISOMountPointURL, sierraOrOlder: installer.sierraOrOlder)
}, },
MistTask(type: .create, description: "resized Disk Image") {
try await DiskImageCreator.create(temporaryResizedImageURL, from: installer.temporaryISOMountPointURL)
},
MistTask(type: .unmount, description: "temporary Disk Image") { MistTask(type: .unmount, description: "temporary Disk Image") {
if FileManager.default.fileExists(atPath: installer.temporaryISOMountPointURL.path) { if FileManager.default.fileExists(atPath: installer.temporaryISOMountPointURL.path) {
try await DiskImageUnmounter.unmount(installer.temporaryISOMountPointURL) try await DiskImageUnmounter.unmount(installer.temporaryISOMountPointURL)
@ -462,11 +458,8 @@ class TaskManager: ObservableObject {
try await DiskImageUnmounter.unmount(url) try await DiskImageUnmounter.unmount(url)
} }
}, },
MistTask(type: .remove, description: "temporary Disk Image") { MistTask(type: .convert, description: "temporary Disk Image to ISO") {
try FileManager.default.removeItem(at: temporaryImageURL) try await ISOConverter.convert(temporaryImageURL, destination: temporaryCDRURL)
},
MistTask(type: .convert, description: "resized Disk Image to ISO") {
try await ISOConverter.convert(temporaryResizedImageURL, destination: temporaryCDRURL)
}, },
MistTask(type: .save, description: "ISO to destination") { MistTask(type: .save, description: "ISO to destination") {
try await FileMover.move(temporaryCDRURL, to: isoURL) try await FileMover.move(temporaryCDRURL, to: isoURL)