diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj index 1460c78..1fbac95 100644 --- a/PHP Monitor.xcodeproj/project.pbxproj +++ b/PHP Monitor.xcodeproj/project.pbxproj @@ -831,7 +831,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 136; + CURRENT_PROJECT_VERSION = 137; DEVELOPMENT_TEAM = 8M54J5J787; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = phpmon/Info.plist; @@ -840,7 +840,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 4.1.1; + MARKETING_VERSION = 4.1.2; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -856,7 +856,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 136; + CURRENT_PROJECT_VERSION = 137; DEVELOPMENT_TEAM = 8M54J5J787; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = phpmon/Info.plist; @@ -865,7 +865,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 4.1.1; + MARKETING_VERSION = 4.1.2; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/README.md b/README.md index 6829a23..0eb15be 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/Domain/Core/Startup.swift b/phpmon/Domain/Core/Startup.swift index b42c8ab..d85df5f 100644 --- a/phpmon/Domain/Core/Startup.swift +++ b/phpmon/Domain/Core/Startup.swift @@ -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, diff --git a/phpmon/Domain/Terminal/Paths.swift b/phpmon/Domain/Terminal/Paths.swift index 6ffe80a..9dd66b9 100644 --- a/phpmon/Domain/Terminal/Paths.swift +++ b/phpmon/Domain/Terminal/Paths.swift @@ -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 { diff --git a/phpmon/Localizable.strings b/phpmon/Localizable.strings index 30031fa..dc11bb0 100644 --- a/phpmon/Localizable.strings +++ b/phpmon/Localizable.strings @@ -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";