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

📝 Annotate environment checks (#146)

Browse Source
This commit is contained in:
Nico Verbruggen
2022-03-09 16:41:47 +01:00
parent 3b297e07dc
commit 06a8022265
1 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
phpmon/Domain/App/Startup.swift
View File

@ -85,6 +85,9 @@ class Startup {
// MARK: - Check (List) // MARK: - Check (List)
public var checks: [EnvironmentCheck] = [ public var checks: [EnvironmentCheck] = [
// =================================================================================
// The Homebrew binary must exist.
// =================================================================================
EnvironmentCheck( EnvironmentCheck(
command: { return !FileManager.default.fileExists(atPath: Paths.brew) }, command: { return !FileManager.default.fileExists(atPath: Paths.brew) },
name: "`\(Paths.brew)` exists", name: "`\(Paths.brew)` exists",
@ -99,6 +102,9 @@ class Startup {
buttonText: "alert.homebrew_missing.quit".localized, buttonText: "alert.homebrew_missing.quit".localized,
requiresAppRestart: true requiresAppRestart: true
), ),
// =================================================================================
// The PHP binary must exist.
// =================================================================================
EnvironmentCheck( EnvironmentCheck(
command: { return !Filesystem.fileExists(Paths.php) }, command: { return !Filesystem.fileExists(Paths.php) },
name: "`\(Paths.php)` exists", name: "`\(Paths.php)` exists",
@ -106,6 +112,9 @@ class Startup {
subtitleText: "startup.errors.php_binary.subtitle".localized, subtitleText: "startup.errors.php_binary.subtitle".localized,
descriptionText: "startup.errors.php_binary.desc".localized(Paths.php) descriptionText: "startup.errors.php_binary.desc".localized(Paths.php)
), ),
// =================================================================================
// Make sure we can detect one or more PHP installations.
// =================================================================================
EnvironmentCheck( EnvironmentCheck(
command: { return !Shell.pipe("ls \(Paths.optPath) | grep php").contains("php") }, command: { return !Shell.pipe("ls \(Paths.optPath) | grep php").contains("php") },
name: "`ls \(Paths.optPath) | grep php` returned php result", name: "`ls \(Paths.optPath) | grep php` returned php result",
@ -115,10 +124,12 @@ class Startup {
), ),
descriptionText: "startup.errors.php_opt.desc".localized descriptionText: "startup.errors.php_opt.desc".localized
), ),
// =================================================================================
// The Valet binary must exist.
// =================================================================================
EnvironmentCheck( EnvironmentCheck(
command: { command: {
return !(Filesystem.fileExists(Paths.valet) return !(Filesystem.fileExists(Paths.valet) || Filesystem.fileExists("~/.composer/vendor/bin/valet"))
|| Filesystem.fileExists("~/.composer/vendor/bin/valet"))
}, },
name: "`valet` binary exists", name: "`valet` binary exists",
titleText: "startup.errors.valet_executable.title".localized, titleText: "startup.errors.valet_executable.title".localized,
@ -127,6 +138,11 @@ class Startup {
Paths.valet Paths.valet
) )
), ),
// =================================================================================
// Check if Valet and Homebrew need manual password intervention. If they do, then
// PHP Monitor will be unable to run these commands, which prevents PHP Monitor from
// functioning correctly. Let the user know that they need to run `valet trust`.
// =================================================================================
EnvironmentCheck( EnvironmentCheck(
command: { return !Shell.pipe("cat /private/etc/sudoers.d/brew").contains(Paths.brew) }, command: { return !Shell.pipe("cat /private/etc/sudoers.d/brew").contains(Paths.brew) },
name: "`/private/etc/sudoers.d/brew` contains brew", name: "`/private/etc/sudoers.d/brew` contains brew",
@ -139,6 +155,9 @@ class Startup {
titleText: "startup.errors.sudoers_valet.title".localized, titleText: "startup.errors.sudoers_valet.title".localized,
subtitleText: "startup.errors.sudoers_valet.subtitle".localized subtitleText: "startup.errors.sudoers_valet.subtitle".localized
), ),
// =================================================================================
// Verify if the Homebrew services are running (as root).
// =================================================================================
EnvironmentCheck( EnvironmentCheck(
command: { return HomebrewDiagnostics.cannotLoadService() }, command: { return HomebrewDiagnostics.cannotLoadService() },
name: "`sudo \(Paths.brew) services info` JSON loaded", name: "`sudo \(Paths.brew) services info` JSON loaded",
@ -146,10 +165,11 @@ class Startup {
subtitleText: "startup.errors.services_json_error.subtitle".localized, subtitleText: "startup.errors.services_json_error.subtitle".localized,
descriptionText: "startup.errors.services_json_error.desc".localized descriptionText: "startup.errors.services_json_error.desc".localized
), ),
// =================================================================================
// Determine the Valet version and ensure it isn't unknown.
// =================================================================================
EnvironmentCheck( EnvironmentCheck(
command: { command: {
// Determine the Valet version only AFTER confirming the correct permission is in place
// or otherwise this command will never return a valid version number
Valet.shared.version = VersionExtractor.from(valet("--version", sudo: false)) Valet.shared.version = VersionExtractor.from(valet("--version", sudo: false))
return Valet.shared.version == nil return Valet.shared.version == nil
}, },