phpmon/app
1
0
Fork 0
mirror of https://github.com/nicoverbruggen/phpmon.git synced 2025-08-09 20:53:01 +02:00
Code Releases Activity

👌 Improved logging, HOMEBREW_NO_INSTALL_UPGRADE

Browse Source
This commit is contained in:
Nico Verbruggen
2023-03-16 19:26:24 +01:00
parent bb56e33ee8
commit 41af058661
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,6 @@ public class PhpVersionInstaller {
case purge case purge
} }
/** /**
Performs the desired action on the provided PHP version. Performs the desired action on the provided PHP version.
@@ -73,7 +72,8 @@ public class PhpVersionInstaller {
await Shell.quiet("brew tap shivammathur/php") await Shell.quiet("brew tap shivammathur/php")
} }
command = "brew install \(formula) --force" // Set HOMEBREW_NO_INSTALL_UPGRADE when installing or upgrading
command = "export HOMEBREW_NO_INSTALL_UPGRADE=1 && brew install \(formula) --force"
} }
// TODO: Ensure that a PHP version can also be updated // TODO: Ensure that a PHP version can also be updated
@@ -109,6 +109,10 @@ public class PhpVersionInstaller {
command, command,
didReceiveOutput: { text, _ in didReceiveOutput: { text, _ in
if action == .install { if action == .install {
if !text.isEmpty {
Log.perf(text)
}
// Check if we can recognize any of the typical progress steps // Check if we can recognize any of the typical progress steps
if let (number, text) = Self.reportInstallationProgress(text) { if let (number, text) = Self.reportInstallationProgress(text) {
Task { @MainActor in Task { @MainActor in
@@ -136,9 +140,9 @@ public class PhpVersionInstaller {
} else { } else {
// Do not close the window and notify about failure // Do not close the window and notify about failure
Task { @MainActor in Task { @MainActor in
subject.title = "Operation failed." subject.title = "Operation failed: something went wrong"
subject.progress = 1 subject.progress = 1
subject.description = "Something went wrong." subject.description = "Oops. You may close this window."
} }
} }
} else { } else {
@@ -174,7 +178,7 @@ public class PhpVersionInstaller {
return return
} }
Log.info("The ownership of the folder is currently not correct.") Log.info("The ownership of the folder at `\(binaryPath)` is currently not correct. Will prompt to take ownership!")
let script = """ let script = """
\(Paths.brew) services stop \(formula) \ \(Paths.brew) services stop \(formula) \
@@ -190,6 +194,8 @@ public class PhpVersionInstaller {
if eventResult == nil { if eventResult == nil {
throw HomebrewPermissionError(kind: .applescriptNilError) throw HomebrewPermissionError(kind: .applescriptNilError)
} }
Log.info("Ownership was taken of the folder at `\(binaryPath)`.")
} }
/** /**