phpmon/app
1
0
Fork 0
mirror of https://github.com/nicoverbruggen/phpmon.git synced 2025-11-09 05:40:07 +01:00
Code Releases Activity

🐛 Fix issue with Valet precedence (#77)

Browse Source
This commit is contained in:
Nico Verbruggen
2022-01-03 17:00:03 +01:00
parent b7766aeec2
commit e372480249
5 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpmon/Domain/Core/Startup.swift
View File

@@ -59,7 +59,6 @@ class Startup {
// Check for Valet; it can be symlinked or in .composer/vendor/bin
!(Shell.pipe("cat /private/etc/sudoers.d/valet").contains("/usr/local/bin/valet")
|| Shell.pipe("cat /private/etc/sudoers.d/valet").contains("/opt/homebrew/bin/valet")
|| Shell.pipe("cat /private/etc/sudoers.d/valet").contains(".composer/vendor/bin/valet")
),
messageText: "startup.errors.sudoers_valet.title".localized,
informativeText: "startup.errors.sudoers_valet.desc".localized,

2
phpmon/Domain/Terminal/Paths.swift
View File

@@ -38,7 +38,7 @@ class Paths {
// - MARK: Binaries
public static var valet: String {
return "/Users/\(whoami)/.composer/vendor/bin/valet"
return "\(binPath)/valet"
}
public static var brew: String {

2
phpmon/Localizable.strings
View File

@@ -182,7 +182,7 @@ You can do this by running `composer global update` in your terminal. After that
/// 5. Valet & sudoers
"startup.errors.sudoers_valet.title" = "Valet has not been added to sudoers.d";
"startup.errors.sudoers_valet.desc" = "You must run `sudo valet trust` to ensure Valet can start and stop services without having to use sudo every time. The app will not work correctly until you resolve this issue.";
"startup.errors.sudoers_valet.desc" = "You must run `sudo valet trust` to ensure Valet can start and stop services without having to use sudo every time. The app will not work correctly until you resolve this issue. If you did this before, please run `sudo valet trust` again.";
/// 6. Multiple services active
"startup.errors.services.title" = "Multiple PHP services are active";