From f4b1e0745a0dd52ea0fe86b03af70501c826b245 Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Wed, 24 Aug 2022 20:26:32 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Potential=20fix=20for=20parsing?= =?UTF-8?q?=20Valet=20version=20(#188)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- phpmon/Domain/App/Startup.swift | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/phpmon/Domain/App/Startup.swift b/phpmon/Domain/App/Startup.swift index 589e938..8d80154 100644 --- a/phpmon/Domain/App/Startup.swift +++ b/phpmon/Domain/App/Startup.swift @@ -229,8 +229,19 @@ class Startup { EnvironmentCheck( command: { let output = valet("--version", sudo: false) + // Failure condition #1: does not contain Laravel Valet + if !output.contains("Laravel Valet") { + return true + } + // Failure condition #2: version cannot be parsed + let versionString = output + .trimmingCharacters(in: .whitespacesAndNewlines) + .components(separatedBy: "Laravel Valet")[1] + .trimmingCharacters(in: .whitespaces) + // Extract the version number Valet.shared.version = VersionExtractor.from(output) - return Valet.shared.version == nil && output.contains("Laravel Valet") + // Get the actual version + return Valet.shared.version == nil }, name: "`valet --version` was loaded", titleText: "startup.errors.valet_version_unknown.title".localized,