From 3b297e07dc0ee96045d91439674373e5f8fe85e4 Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Wed, 9 Mar 2022 16:19:41 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Adjust=20the=20order=20of=20star?= =?UTF-8?q?tup=20checks=20(#146)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PHP Monitor.xcodeproj/project.pbxproj | 4 ++-- phpmon/Domain/App/Startup.swift | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj index 11ebe82..6bec8b3 100644 --- a/PHP Monitor.xcodeproj/project.pbxproj +++ b/PHP Monitor.xcodeproj/project.pbxproj @@ -1207,7 +1207,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 715; + CURRENT_PROJECT_VERSION = 717; DEBUG = YES; DEVELOPMENT_TEAM = 8M54J5J787; ENABLE_HARDENED_RUNTIME = YES; @@ -1233,7 +1233,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 715; + CURRENT_PROJECT_VERSION = 717; DEBUG = NO; DEVELOPMENT_TEAM = 8M54J5J787; ENABLE_HARDENED_RUNTIME = YES; diff --git a/phpmon/Domain/App/Startup.swift b/phpmon/Domain/App/Startup.swift index c540f41..f2d805f 100644 --- a/phpmon/Domain/App/Startup.swift +++ b/phpmon/Domain/App/Startup.swift @@ -127,13 +127,6 @@ class Startup { Paths.valet ) ), - EnvironmentCheck( - command: { return HomebrewDiagnostics.cannotLoadService() }, - name: "`sudo \(Paths.brew) services info` JSON loaded", - titleText: "startup.errors.services_json_error.title".localized, - subtitleText: "startup.errors.services_json_error.subtitle".localized, - descriptionText: "startup.errors.services_json_error.desc".localized - ), EnvironmentCheck( command: { return !Shell.pipe("cat /private/etc/sudoers.d/brew").contains(Paths.brew) }, name: "`/private/etc/sudoers.d/brew` contains brew", @@ -146,6 +139,13 @@ class Startup { titleText: "startup.errors.sudoers_valet.title".localized, subtitleText: "startup.errors.sudoers_valet.subtitle".localized ), + EnvironmentCheck( + command: { return HomebrewDiagnostics.cannotLoadService() }, + name: "`sudo \(Paths.brew) services info` JSON loaded", + titleText: "startup.errors.services_json_error.title".localized, + subtitleText: "startup.errors.services_json_error.subtitle".localized, + descriptionText: "startup.errors.services_json_error.desc".localized + ), EnvironmentCheck( command: { // Determine the Valet version only AFTER confirming the correct permission is in place