From 321b4aaf8b8318a813fcafdcc6905f8457acf96d Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Mon, 12 Feb 2024 15:26:48 +0100 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=90=9B=20Fix=20extension=20detection?= =?UTF-8?q?=20on=20Intel=20(#275)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PHP Monitor.xcodeproj/project.pbxproj | 24 ++++++++++++------------ phpmon/Common/Core/Paths.swift | 4 ++++ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj index 9deb85d9..084da931 100644 --- a/PHP Monitor.xcodeproj/project.pbxproj +++ b/PHP Monitor.xcodeproj/project.pbxproj @@ -3655,7 +3655,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1422; + CURRENT_PROJECT_VERSION = 1423; DEAD_CODE_STRIPPING = YES; DEBUG = YES; DEVELOPMENT_TEAM = 8M54J5J787; @@ -3668,7 +3668,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 12.4; - MARKETING_VERSION = 7.0; + MARKETING_VERSION = 7.0.1; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon; PRODUCT_MODULE_NAME = PHP_Monitor; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -3686,7 +3686,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1422; + CURRENT_PROJECT_VERSION = 1423; DEAD_CODE_STRIPPING = YES; DEBUG = NO; DEVELOPMENT_TEAM = 8M54J5J787; @@ -3699,7 +3699,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 12.4; - MARKETING_VERSION = 7.0; + MARKETING_VERSION = 7.0.1; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon; PRODUCT_MODULE_NAME = PHP_Monitor; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -3927,7 +3927,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1422; + CURRENT_PROJECT_VERSION = 1423; DEAD_CODE_STRIPPING = YES; DEBUG = NO; DEVELOPMENT_TEAM = 8M54J5J787; @@ -3940,7 +3940,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 12.4; - MARKETING_VERSION = 7.0; + MARKETING_VERSION = 7.0.1; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.dev; PRODUCT_MODULE_NAME = PHP_Monitor; PRODUCT_NAME = "$(TARGET_NAME) DEV"; @@ -4044,7 +4044,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1422; + CURRENT_PROJECT_VERSION = 1423; DEAD_CODE_STRIPPING = YES; DEBUG = YES; DEVELOPMENT_TEAM = 8M54J5J787; @@ -4057,7 +4057,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 12.4; - MARKETING_VERSION = 7.0; + MARKETING_VERSION = 7.0.1; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.dev; PRODUCT_MODULE_NAME = PHP_Monitor; PRODUCT_NAME = "$(TARGET_NAME) DEV"; @@ -4161,7 +4161,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1422; + CURRENT_PROJECT_VERSION = 1423; DEAD_CODE_STRIPPING = YES; DEBUG = YES; DEVELOPMENT_TEAM = 8M54J5J787; @@ -4174,7 +4174,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 12.4; - MARKETING_VERSION = 7.0; + MARKETING_VERSION = 7.0.1; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.eap; PRODUCT_MODULE_NAME = PHP_Monitor; PRODUCT_NAME = "$(TARGET_NAME) EAP"; @@ -4343,7 +4343,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1422; + CURRENT_PROJECT_VERSION = 1423; DEAD_CODE_STRIPPING = YES; DEBUG = NO; DEVELOPMENT_TEAM = 8M54J5J787; @@ -4356,7 +4356,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 12.4; - MARKETING_VERSION = 7.0; + MARKETING_VERSION = 7.0.1; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.eap; PRODUCT_MODULE_NAME = PHP_Monitor; PRODUCT_NAME = "$(TARGET_NAME) EAP"; diff --git a/phpmon/Common/Core/Paths.swift b/phpmon/Common/Core/Paths.swift index 7255b20a..ca1f7968 100644 --- a/phpmon/Common/Core/Paths.swift +++ b/phpmon/Common/Core/Paths.swift @@ -103,6 +103,10 @@ public class Paths { } public static var tapPath: String { + if shared.baseDir == .usr { + return "\(shared.baseDir.rawValue)/homebrew/Library/Taps" + } + return "\(shared.baseDir.rawValue)/Library/Taps" } From bc208bddf9b3f21175a32049a0085cdc216e615c Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Mon, 12 Feb 2024 16:29:34 +0100 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=91=8C=20Notify=20if=20list=20of=20ex?= =?UTF-8?q?tensions=20is=20empty=20(#275)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/PhpExtensionManagerView.swift | 12 ++++++++++++ phpmon/de.lproj/Localizable.strings | 6 ++++++ phpmon/en.lproj/Localizable.strings | 7 +++++++ phpmon/fr.lproj/Localizable.strings | 8 ++++++++ phpmon/nl.lproj/Localizable.strings | 7 +++++++ phpmon/pt-PT.lproj/Localizable.strings | 7 +++++++ phpmon/vi.lproj/Localizable.strings | 7 +++++++ 7 files changed, 54 insertions(+) diff --git a/phpmon/Modules/PHP Extension Manager/UI/PhpExtensionManagerView.swift b/phpmon/Modules/PHP Extension Manager/UI/PhpExtensionManagerView.swift index 72a165a2..2368f39f 100644 --- a/phpmon/Modules/PHP Extension Manager/UI/PhpExtensionManagerView.swift +++ b/phpmon/Modules/PHP Extension Manager/UI/PhpExtensionManagerView.swift @@ -59,6 +59,18 @@ struct PhpExtensionManagerView: View { } } .frame(width: 600, height: 600) + .onAppear { + Task { + await delay(seconds: 1) + if self.manager.extensions.isEmpty { + self.presentErrorAlert( + title: "phpextman.errors.not_found.title".localized, + description: "phpextman.errors.not_found.desc".localized, + button: "generic.ok".localized + ) + } + } + } } // MARK: View Variables diff --git a/phpmon/de.lproj/Localizable.strings b/phpmon/de.lproj/Localizable.strings index 9f0a1a34..c7d13344 100644 --- a/phpmon/de.lproj/Localizable.strings +++ b/phpmon/de.lproj/Localizable.strings @@ -105,6 +105,12 @@ "phpextman.list.status.dependent" = "Sie können diese nicht deinstallieren, bevor Sie %@ deinstallieren."; "phpextman.list.status.can_manage" = "Diese Erweiterung ist installiert und kann von PHP Monitor verwaltet werden."; +"phpextman.errors.not_found.title" = "Oh oh. Keine Erweiterungen gefunden!"; +"phpextman.errors.not_found.desc" = "Das sollte eigentlich nicht passieren. Sie müssen möglicherweise den folgenden Befehl in Ihrem Terminal ausführen: + +`brew tap shivammathur/extensions` + +und PHP Monitor neu starten, damit die Erweiterungen sichtbar werden. Wenn das Problem nach Ausführen des Befehls und Neustart von PHP Monitor weiterhin besteht, ziehen Sie bitte in Erwägung, ein Issue auf GitHub zu eröffnen."; // PHPMAN diff --git a/phpmon/en.lproj/Localizable.strings b/phpmon/en.lproj/Localizable.strings index ae3df756..5dc6b34f 100644 --- a/phpmon/en.lproj/Localizable.strings +++ b/phpmon/en.lproj/Localizable.strings @@ -120,6 +120,13 @@ "phpextman.list.status.dependent" = "You cannot uninstall this before uninstalling %@."; "phpextman.list.status.can_manage" = "This extension is installed and can be managed by PHP Monitor."; +"phpextman.errors.not_found.title" = "Uh oh. No extensions discovered!"; +"phpextman.errors.not_found.desc" = "This is not supposed to happen. You may need to run the following command in your terminal: + +`brew tap shivammathur/extensions` + +and restart PHP Monitor for extensions to become visible. If the problem persists after running the command and restarting PHP Monitor, please consider opening an issue on GitHub."; + // PHPMAN "phpman.busy.title" = "Checking for updates!"; diff --git a/phpmon/fr.lproj/Localizable.strings b/phpmon/fr.lproj/Localizable.strings index 1f5fd370..33277a25 100644 --- a/phpmon/fr.lproj/Localizable.strings +++ b/phpmon/fr.lproj/Localizable.strings @@ -120,6 +120,14 @@ "phpextman.list.status.dependent" = "Vous ne pouvez pas désinstaller ceci avant de désinstaller %@."; "phpextman.list.status.can_manage" = "Cette extension est installée et peut être gérée par PHP Monitor."; +"phpextman.errors.not_found.title" = "Oh là là. Aucune extension découverte !"; +"phpextman.errors.not_found.desc" = "Ceci n'est pas censé se produire. Vous devrez peut-être exécuter la commande suivante dans votre terminal : + +`brew tap shivammathur/extensions` + +et redémarrer PHP Monitor pour que les extensions deviennent visibles. Si le problème persiste après avoir exécuté la commande et redémarré PHP Monitor, veuillez envisager d'ouvrir un problème sur GitHub."; + + // PHPMAN "phpman.busy.title" = "Vérification des mises à jour en cours !"; diff --git a/phpmon/nl.lproj/Localizable.strings b/phpmon/nl.lproj/Localizable.strings index 23064a41..b1831a57 100644 --- a/phpmon/nl.lproj/Localizable.strings +++ b/phpmon/nl.lproj/Localizable.strings @@ -106,6 +106,13 @@ "phpextman.list.status.dependent" = "U kunt dit niet deïnstalleren voordat u %@ deïnstalleert."; "phpextman.list.status.can_manage" = "Deze extensie is geïnstalleerd en kan worden beheerd door PHP Monitor."; +"phpextman.errors.not_found.title" = "Oeps. Geen extensies gevonden!"; +"phpextman.errors.not_found.desc" = "Dit zou niet moeten gebeuren. Mogelijk moet je het volgende commando in je terminal uitvoeren: + +`brew tap shivammathur/extensions` + +en PHP Monitor herstarten om de extensies zichtbaar te maken. Als het probleem zich blijft voordoen na het uitvoeren van het commando en het herstarten van PHP Monitor, overweeg dan om een issue te openen op GitHub."; + // PHPMAN "phpman.busy.title" = "Bezig met zoeken naar updates!"; diff --git a/phpmon/pt-PT.lproj/Localizable.strings b/phpmon/pt-PT.lproj/Localizable.strings index e115a964..c3c47235 100644 --- a/phpmon/pt-PT.lproj/Localizable.strings +++ b/phpmon/pt-PT.lproj/Localizable.strings @@ -105,6 +105,13 @@ "phpextman.list.status.dependent" = "Você não pode desinstalar isso antes de desinstalar %@."; "phpextman.list.status.can_manage" = "Esta extensão está instalada e pode ser gerenciada pelo PHP Monitor."; +"phpextman.errors.not_found.title" = "Uh oh. Nenhuma extensão descoberta!"; +"phpextman.errors.not_found.desc" = "Isto não deveria acontecer. Pode ser necessário executar o seguinte comando no seu terminal: + +`brew tap shivammathur/extensions` + +e reiniciar o PHP Monitor para que as extensões se tornem visíveis. Se o problema persistir após executar o comando e reiniciar o PHP Monitor, por favor considere abrir um problema no GitHub."; + // PHPMAN "phpman.busy.title" = "Procurando atualizações!"; diff --git a/phpmon/vi.lproj/Localizable.strings b/phpmon/vi.lproj/Localizable.strings index fad9bdc2..3a2b8002 100644 --- a/phpmon/vi.lproj/Localizable.strings +++ b/phpmon/vi.lproj/Localizable.strings @@ -105,6 +105,13 @@ "phpextman.list.status.dependent" = "Bạn không thể gỡ cài đặt điều này trước khi gỡ cài đặt %@."; "phpextman.list.status.can_manage" = "Tiện ích mở rộng này đã được cài đặt và có thể được quản lý bởi PHP Monitor."; +"phpextman.errors.not_found.title" = "Ồ. Không phát hiện thấy tiện ích mở rộng nào!"; +"phpextman.errors.not_found.desc" = "Điều này không nên xảy ra. Bạn có thể cần chạy lệnh sau trong terminal của mình: + +`brew tap shivammathur/extensions` + +và khởi động lại PHP Monitor để các tiện ích mở rộng trở nên hiển thị. Nếu vấn đề vẫn tiếp diễn sau khi chạy lệnh và khởi động lại PHP Monitor, xin hãy xem xét mở một vấn đề trên GitHub."; + // PHPMAN "phpman.busy.title" = "Đang kiểm tra cập nhật!"; From 7b10973330235750769be7692c62d7748a20199a Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Mon, 12 Feb 2024 16:33:01 +0100 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=94=A7=20Bump=20build?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PHP Monitor.xcodeproj/project.pbxproj | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj index 084da931..b843a41f 100644 --- a/PHP Monitor.xcodeproj/project.pbxproj +++ b/PHP Monitor.xcodeproj/project.pbxproj @@ -3655,7 +3655,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1423; + CURRENT_PROJECT_VERSION = 1425; DEAD_CODE_STRIPPING = YES; DEBUG = YES; DEVELOPMENT_TEAM = 8M54J5J787; @@ -3686,7 +3686,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1423; + CURRENT_PROJECT_VERSION = 1425; DEAD_CODE_STRIPPING = YES; DEBUG = NO; DEVELOPMENT_TEAM = 8M54J5J787; @@ -3927,7 +3927,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1423; + CURRENT_PROJECT_VERSION = 1425; DEAD_CODE_STRIPPING = YES; DEBUG = NO; DEVELOPMENT_TEAM = 8M54J5J787; @@ -4044,7 +4044,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1423; + CURRENT_PROJECT_VERSION = 1425; DEAD_CODE_STRIPPING = YES; DEBUG = YES; DEVELOPMENT_TEAM = 8M54J5J787; @@ -4161,7 +4161,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1423; + CURRENT_PROJECT_VERSION = 1425; DEAD_CODE_STRIPPING = YES; DEBUG = YES; DEVELOPMENT_TEAM = 8M54J5J787; @@ -4343,7 +4343,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1423; + CURRENT_PROJECT_VERSION = 1425; DEAD_CODE_STRIPPING = YES; DEBUG = NO; DEVELOPMENT_TEAM = 8M54J5J787;