diff --git a/README.md b/README.md index 8736b15..4064038 100644 --- a/README.md +++ b/README.md @@ -111,9 +111,15 @@ If you're on an Apple Silicon-based Mac, you'll need to add: # on an M1 Mac export PATH=$HOME/bin:/opt/homebrew/bin:$PATH -and add the following to your .zshrc: +and add the following to your .zshrc, but add this BEFORE the homebrew PATH additions: export PATH=$HOME/bin:~/.composer/vendor/bin:$PATH + +If you're adding composer and Homebrew binaries, ensure that Homebrew binaries are preferred by adding these to the path last. On my system, that looks like this: + + export PATH=$HOME/bin:/usr/local/bin:$PATH + export PATH=$HOME/bin:~/.composer/vendor/bin:$PATH + export PATH=$HOME/bin:/opt/homebrew/bin:$PATH Make sure PHP is linked correctly: diff --git a/phpmon-common/Core/Paths.swift b/phpmon-common/Core/Paths.swift index 202e790..355da3e 100644 --- a/phpmon-common/Core/Paths.swift +++ b/phpmon-common/Core/Paths.swift @@ -24,7 +24,7 @@ public class Paths { // - MARK: Binaries public static var valet: String { - return "/Users/\(whoami)/.composer/vendor/bin/valet" + return "\(binPath)/valet" } public static var brew: String { diff --git a/phpmon/Domain/Core/Startup.swift b/phpmon/Domain/Core/Startup.swift index df35fcb..b1e9060 100644 --- a/phpmon/Domain/Core/Startup.swift +++ b/phpmon/Domain/Core/Startup.swift @@ -57,10 +57,9 @@ class Startup { ) performEnvironmentCheck( - // Check for Valet; it can be symlinked or in .composer/vendor/bin + // Check for Valet; it MUST be symlinked thanks to sudoers !(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, diff --git a/phpmon/Localizable.strings b/phpmon/Localizable.strings index 4371640..d3bf975 100644 --- a/phpmon/Localizable.strings +++ b/phpmon/Localizable.strings @@ -200,7 +200,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";