mirrors/Mist
1
0
Fork 0
mirror of https://github.com/ninxsoft/Mist.git synced 2025-05-18 17:25:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add ISO support for Lion + Mountain Lion (#101)

Browse source 
* Add support for Lion + Mountain Lion ISOs on Intel

* Fix typo

* Update compatibility logic
This commit is contained in:
Nindi Gill 2023-10-28 23:30:38 +11:00 • committed by GitHub
parent f17690b98b
commit b72c3e29d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 50 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

84
Mist/Helpers/TaskManager.swift
View file

@ -433,45 +433,57 @@ class TaskManager: ObservableObject {
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))
return [ if installer.mavericksOrNewer {
MistTask(type: .create, description: "temporary Disk Image") { return [
try await DiskImageCreator.create(temporaryImageURL, size: installer.isoSize) MistTask(type: .create, description: "temporary Disk Image") {
}, try await DiskImageCreator.create(temporaryImageURL, size: installer.isoSize)
MistTask(type: .mount, description: "temporary Disk Image") { },
try await DiskImageMounter.mount(temporaryImageURL, mountPoint: installer.temporaryISOMountPointURL) MistTask(type: .mount, description: "temporary Disk Image") {
}, try await DiskImageMounter.mount(temporaryImageURL, mountPoint: installer.temporaryISOMountPointURL)
MistTask(type: .create, description: "macOS Installer in temporary Disk Image") { },
MistTask(type: .create, description: "macOS Installer in temporary Disk Image") {
// Workaround to make macOS Sierra 10.12 createinstallmedia work // Workaround to make macOS Sierra 10.12 createinstallmedia work
if installer.version.hasPrefix("10.12") { if installer.version.hasPrefix("10.12") {
let infoPlistURL: URL = installer.temporaryInstallerURL.appendingPathComponent("/Contents/Info.plist") let infoPlistURL: URL = installer.temporaryInstallerURL.appendingPathComponent("/Contents/Info.plist")
try PropertyListUpdater.update(infoPlistURL, key: "CFBundleShortVersionString", value: "12.6.03") try PropertyListUpdater.update(infoPlistURL, key: "CFBundleShortVersionString", value: "12.6.03")
}
try await InstallMediaCreator.create(createInstallMediaURL, mountPoint: installer.temporaryISOMountPointURL, sierraOrOlder: installer.sierraOrOlder)
},
MistTask(type: .unmount, description: "temporary Disk Image") {
if FileManager.default.fileExists(atPath: installer.temporaryISOMountPointURL.path) {
try await DiskImageUnmounter.unmount(installer.temporaryISOMountPointURL)
}
guard let major: Substring = installer.version.split(separator: ".").first else {
return
}
let url: URL = URL(fileURLWithPath: "/Volumes/Install macOS \(major) beta")
if FileManager.default.fileExists(atPath: url.path) {
try await DiskImageUnmounter.unmount(url)
}
},
MistTask(type: .convert, description: "temporary Disk Image to ISO") {
try await ISOConverter.convert(temporaryImageURL, destination: temporaryCDRURL)
},
MistTask(type: .save, description: "ISO to destination") {
try await FileMover.move(temporaryCDRURL, to: isoURL)
} }
]
try await InstallMediaCreator.create(createInstallMediaURL, mountPoint: installer.temporaryISOMountPointURL, sierraOrOlder: installer.sierraOrOlder) } else {
}, let installESDURL: URL = installer.temporaryInstallerURL.appendingPathComponent("/Contents/SharedSupport/InstallESD.dmg")
MistTask(type: .unmount, description: "temporary Disk Image") { return [
if FileManager.default.fileExists(atPath: installer.temporaryISOMountPointURL.path) { MistTask(type: .convert, description: "Installer Disk Image to ISO") {
try await DiskImageUnmounter.unmount(installer.temporaryISOMountPointURL) try await ISOConverter.convert(installESDURL, destination: temporaryCDRURL)
},
MistTask(type: .save, description: "ISO to destination") {
try await FileMover.move(temporaryCDRURL, to: isoURL)
} }
]
guard let major: Substring = installer.version.split(separator: ".").first else { }
return
}
let url: URL = URL(fileURLWithPath: "/Volumes/Install macOS \(major) beta")
if FileManager.default.fileExists(atPath: url.path) {
try await DiskImageUnmounter.unmount(url)
}
},
MistTask(type: .convert, description: "temporary Disk Image to ISO") {
try await ISOConverter.convert(temporaryImageURL, destination: temporaryCDRURL)
},
MistTask(type: .save, description: "ISO to destination") {
try await FileMover.move(temporaryCDRURL, to: isoURL)
}
]
} }
// swiftlint:disable:next function_parameter_count // swiftlint:disable:next function_parameter_count

14
Mist/Views/List/InstallerExportView.swift
View file

@ -23,20 +23,10 @@ struct InstallerExportView: View {
return false return false
} }
return (architecture == .intel && installer.mavericksOrNewer) || (architecture == .appleSilicon && installer.bigSurOrNewer) return architecture == .intel || (architecture == .appleSilicon && installer.bigSurOrNewer)
} }
private var compatibilityMessage: String { private var compatibilityMessage: String {
"**Note:** ISOs are unavailable for building **macOS Catalina 10.15 and older** on [Apple Silicon Macs](https://support.apple.com/en-us/HT211814)."
guard let architecture: Architecture = Hardware.architecture else {
return ""
}
switch architecture {
case .appleSilicon:
return "**Note:** ISOs are unavailable for building **macOS Catalina 10.15 and older** on [Apple Silicon Macs](https://support.apple.com/en-us/HT211814)."
case .intel:
return "**Note:** ISOs are unavailable for building **OS X Mountain Lion 10.8 and older** on Intel-based Macs."
}
} }
var body: some View { var body: some View {