From 8a47cfd5f1084b265d41c304a9c5efdce7ce7f2d Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Wed, 17 Mar 2021 14:50:26 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Remove=20`which=20valet`=20check?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PHP Monitor.xcodeproj/project.pbxproj | 8 ++++---- phpmon/Domain/Terminal/Startup.swift | 3 +-- phpmon/Localizable.strings | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj index 6494b24..bf6d3d6 100644 --- a/PHP Monitor.xcodeproj/project.pbxproj +++ b/PHP Monitor.xcodeproj/project.pbxproj @@ -577,7 +577,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 48; + CURRENT_PROJECT_VERSION = 49; DEVELOPMENT_TEAM = 8M54J5J787; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = phpmon/Info.plist; @@ -585,7 +585,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 3.1; + MARKETING_VERSION = 3.2; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -601,7 +601,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 48; + CURRENT_PROJECT_VERSION = 49; DEVELOPMENT_TEAM = 8M54J5J787; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = phpmon/Info.plist; @@ -609,7 +609,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 3.1; + MARKETING_VERSION = 3.2; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/phpmon/Domain/Terminal/Startup.swift b/phpmon/Domain/Terminal/Startup.swift index 510894f..4e58ff2 100644 --- a/phpmon/Domain/Terminal/Startup.swift +++ b/phpmon/Domain/Terminal/Startup.swift @@ -39,8 +39,7 @@ class Startup { self.performEnvironmentCheck( // Older versions of Valet might be located in `/usr/local/bin` regardless of Homebrew prefix - !(Shell.pipe("which valet").contains("/usr/local/bin/valet") - || Shell.pipe("which valet").contains("/opt/homebrew/bin/valet")), + !(Shell.fileExists("/usr/local/bin/valet") || Shell.fileExists("/opt/homebrew/bin/valet")), messageText: "startup.errors.valet_executable.title".localized, informativeText: "startup.errors.valet_executable.desc".localized, breaking: true diff --git a/phpmon/Localizable.strings b/phpmon/Localizable.strings index 549f7ad..3c9374c 100644 --- a/phpmon/Localizable.strings +++ b/phpmon/Localizable.strings @@ -74,7 +74,7 @@ /// 3. Valet not installed "startup.errors.valet_executable.title" = "Laravel Valet is not correctly installed"; -"startup.errors.valet_executable.desc" = "You must install Valet with composer. Try running `which valet` in Terminal, it should return `/usr/local/bin/valet` or `/opt/homebrew/bin/valet`. The app will not work correctly until you resolve this issue."; +"startup.errors.valet_executable.desc" = "You must install Valet with composer. Try running `which valet` in Terminal, it should return `/usr/local/bin/valet` or `/opt/homebrew/bin/valet`. The app will not work correctly until you resolve this issue. (PHP Monitor checks for the existence of `valet` in either of these paths.)"; /// 4. Brew & sudoers "startup.errors.sudoers_brew.title" = "Brew has not been added to sudoers.d";