Skip to content

Merge mindi/bugfix-legacy-installers to fix legacy installer tasks #195

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

Open
sulliops wants to merge 4 commits into
base: main
Choose a base branch
from
+17 −1
Open

Merge mindi/bugfix-legacy-installers to fix legacy installer tasks #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
47ba95c
Stitch High Sierra, Mojave and Catalina installers
ninxsoft Feb 15, 2025
020acbf
Remove temporaryInstallerWithAdHocCodeSignaturesURL just-in-time
ninxsoft Feb 15, 2025
d63f8fd
Target correct volume when creating bootable installers
ninxsoft Feb 15, 2025
21c94f7
Merge branch 'main' into nindi/bugfix-legacy-installers
sulliops Jul 3, 2026
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
7 changes: 6 additions & 1 deletion Mist/Helpers/Generator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,11 @@ enum Generator {
var arguments: [String] = ["\(installer.temporaryInstallerURL.path)/Contents/Resources/createinstallmedia"]

if !installer.bigSurOrNewer {

if FileManager.default.fileExists(atPath: installer.temporaryInstallerWithAdHocCodeSignaturesURL.path) {
try FileManager.default.removeItem(at: installer.temporaryInstallerWithAdHocCodeSignaturesURL)
}

// swiftlint:disable:next line_length
!options.quiet ? PrettyPrint.print("Copying '\(installer.temporaryInstallerURL.path)' to '\(installer.temporaryInstallerWithAdHocCodeSignaturesURL.path)'...", noAnsi: options.noAnsi) : Mist.noop()
try FileManager.default.copyItem(at: installer.temporaryInstallerURL, to: installer.temporaryInstallerWithAdHocCodeSignaturesURL)
Expand All @@ -399,7 +404,7 @@ enum Generator {
arguments = ["\(installer.temporaryInstallerWithAdHocCodeSignaturesURL.path)/Contents/Resources/createinstallmedia"]
}

arguments += ["--volume", installer.temporaryISOMountPointURL.path, "--nointeraction"]
arguments += ["--volume", volume, "--nointeraction"]

if installer.sierraOrOlder {
arguments += ["--applicationpath", installer.temporaryInstallerURL.path]
Expand Down
7 changes: 7 additions & 0 deletions Mist/Helpers/InstallerCreator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,13 @@ enum InstallerCreator {
_ = try Shell.execute(arguments, environment: variables)
}

if installer.highSierraOrNewer, !installer.bigSurOrNewer {
arguments = ["ditto", "/Applications/Install \(installer.name).app", "\(installer.temporaryDiskImageMountPointURL.path)/Applications/Install \(installer.name).app"]
_ = try Shell.execute(arguments)
arguments = ["rm", "-r", "/Applications/Install \(installer.name).app"]
_ = try Shell.execute(arguments)
}

if installer.catalinaOrNewer {
arguments = ["ditto", "\(installer.temporaryDiskImageMountPointURL.path)Applications", "\(installer.temporaryDiskImageMountPointURL.path)/Applications"]
_ = try Shell.execute(arguments)
Expand Down
4 changes: 4 additions & 0 deletions Mist/Model/Installer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,6 +614,10 @@ struct Installer: Decodable {
version.range(of: "^10\\.([7-9]|1[0-2])\\.", options: .regularExpression) != nil
}

var highSierraOrNewer: Bool {
bigSurOrNewer || version.range(of: "^10\\.1[3-5]\\.", options: .regularExpression) != nil
}

var catalinaOrNewer: Bool {
bigSurOrNewer || version.range(of: "^10\\.15\\.", options: .regularExpression) != nil
}
Expand Down