diff --git a/phpmon/Common/Core/Actions.swift b/phpmon/Common/Core/Actions.swift index 86408df..8abc354 100644 --- a/phpmon/Common/Core/Actions.swift +++ b/phpmon/Common/Core/Actions.swift @@ -13,21 +13,21 @@ class Actions { // MARK: - Services public static func restartPhpFpm() async { - await brew("services restart \(Homebrew.Formulae.php.name)", sudo: Homebrew.Formulae.php.elevated) + await brew("services restart \(Homebrew.Formulae.php)", sudo: Homebrew.Formulae.php.elevated) } public static func restartNginx() async { - await brew("services restart \(Homebrew.Formulae.nginx.name)", sudo: Homebrew.Formulae.nginx.elevated) + await brew("services restart \(Homebrew.Formulae.nginx)", sudo: Homebrew.Formulae.nginx.elevated) } public static func restartDnsMasq() async { - await brew("services restart \(Homebrew.Formulae.dnsmasq.name)", sudo: Homebrew.Formulae.dnsmasq.elevated) + await brew("services restart \(Homebrew.Formulae.dnsmasq)", sudo: Homebrew.Formulae.dnsmasq.elevated) } public static func stopValetServices() async { - await brew("services stop \(Homebrew.Formulae.php.name)", sudo: Homebrew.Formulae.php.elevated) - await brew("services stop \(Homebrew.Formulae.nginx.name)", sudo: Homebrew.Formulae.nginx.elevated) - await brew("services stop \(Homebrew.Formulae.dnsmasq.name)", sudo: Homebrew.Formulae.dnsmasq.elevated) + await brew("services stop \(Homebrew.Formulae.php)", sudo: Homebrew.Formulae.php.elevated) + await brew("services stop \(Homebrew.Formulae.nginx)", sudo: Homebrew.Formulae.nginx.elevated) + await brew("services stop \(Homebrew.Formulae.dnsmasq)", sudo: Homebrew.Formulae.dnsmasq.elevated) } public static func fixHomebrewPermissions() throws { @@ -54,9 +54,10 @@ class Actions { + " && " + cellarCommands.joined(separator: " && ") - let appleScript = NSAppleScript( - source: "do shell script \"\(script)\" with administrator privileges" - ) + let source = "do shell script \"\(script)\" with administrator privileges" + + Log.perf(source) + let appleScript = NSAppleScript(source: source) let eventResult: NSAppleEventDescriptor? = appleScript?.executeAndReturnError(nil) diff --git a/phpmon/Common/Core/Homebrew.swift b/phpmon/Common/Core/Homebrew.swift index c570f2a..de96a64 100644 --- a/phpmon/Common/Core/Homebrew.swift +++ b/phpmon/Common/Core/Homebrew.swift @@ -36,10 +36,14 @@ class Homebrew { } } -class HomebrewFormula: Equatable, Hashable { +class HomebrewFormula: Equatable, Hashable, CustomStringConvertible { let name: String let elevated: Bool + var description: String { + return name + } + init(_ name: String, elevated: Bool = true) { self.name = name self.elevated = elevated