phpmon/app
1
0
Fork 0
mirror of https://github.com/nicoverbruggen/phpmon.git synced 2025-08-07 03:50:08 +02:00
Code Releases Activity

👌 Bring window to front, avoid crashing

Browse Source
This commit is contained in:
Nico Verbruggen
2023-03-16 21:09:21 +01:00
parent 41af058661
commit 78c24555f7
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
phpmon/Common/PHP/PhpVersionInstaller.swift
View File

@ -7,6 +7,7 @@
//
import Foundation
import Cocoa
public class PhpVersionInstaller {
public static var installables = [
@ -26,10 +27,9 @@ public class PhpVersionInstaller {
case purge
}
// swiftlint:disable cyclomatic_complexity function_body_length
/**
Performs the desired action on the provided PHP version.
swiftlint:disable cyclomatic_complexity function_body_length
*/
public static func modifyPhpVersion(version: String, action: PhpInstallAction) async {
let title = {
@ -62,18 +62,24 @@ public class PhpVersionInstaller {
let installables = Self.installables
if installables.keys.contains(version) {
let window = await ProgressWindowView.display(subject)
let windowController = await ProgressWindowView.display(subject)
await NSApp.activate(ignoringOtherApps: true)
await windowController.window?.makeKeyAndOrderFront(nil)
let formula = installables[version]!
var command = ""
var command: String!
if action == .install {
if formula.contains("shivammathur") && !HomebrewDiagnostics.installedTaps.contains("shivammathur/php") {
await Shell.quiet("brew tap shivammathur/php")
}
// Set HOMEBREW_NO_INSTALL_UPGRADE when installing or upgrading
command = "export HOMEBREW_NO_INSTALL_UPGRADE=1 && brew install \(formula) --force"
command = """
export HOMEBREW_NO_INSTALL_UPGRADE=1 \
&& export HOMEBREW_NO_INSTALL_CLEANUP=1 \
&& brew install \(formula) --force
"""
}
// TODO: Ensure that a PHP version can also be updated
@ -134,9 +140,8 @@ public class PhpVersionInstaller {
await MainMenu.shared.refreshActiveInstallation()
Task { @MainActor in
subject.description = "The operation succeeded. This window will close in 5 seconds."
windowController.close()
}
await window.close()
} else {
// Do not close the window and notify about failure
Task { @MainActor in