Skip to content

fix: simplified rosetta 2 installation status check #273

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
ilgrandeanonimo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: simplified rosetta 2 installation status check #273

Show file tree
Hide file tree
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
11 changes: 3 additions & 8 deletions Mythic/Utilities/Rosetta.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,9 @@
import Foundation

final class Rosetta {
static var exists: Bool { // thread-blocking, but ~0.04 sec cpu time
let process: Process = .init()
process.executableURL = .init(filePath: "/usr/bin/pgrep")
process.arguments = ["oahd"]

let result = try? process.runWrapped()

return result?.standardOutput?.isEmpty == false
static var isInstalled: Bool {
FileManager.default.isExecutableFile(
atPath: "/Library/Apple/usr/libexec/oah/libRosettaRuntime")
}

struct AgreementFailure: LocalizedError {
Expand Down
2 changes: 1 addition & 1 deletion Mythic/Views/Unified/Sheets/RosettaInstallationView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ extension RosettaInstallationView {
ProgressView(value: percentageCompletion, total: 100.0)
.progressViewStyle(.linear)
.task {
guard !Rosetta.exists else {
guard !Rosetta.isInstalled else {
viewModel.stepStage(); return
}

Expand Down
Loading