From a3b69681152c23fd3f35b7f5bad52287044ab1c1 Mon Sep 17 00:00:00 2001 From: Alex Pavlov Date: Mon, 29 Mar 2021 08:15:59 +0300 Subject: [PATCH 1/2] Update for disabled module Disabled module have config: ``` [blackfire] ;extension="/usr/local/Cellar/blackfire-php80/1.53.0/blackfire.so" blackfire.agent_socket = unix:///usr/local/var/run/blackfire-agent.sock ;blackfire.log_level = 3 ;blackfire.log_file = /tmp/blackfire.log ``` Now I have error on update: ``` ==> Upgrading blackfireio/blackfire/blackfire-php80 1.53.0 -> 1.54.0 ==> Downloading https://packages.blackfire.io/homebrew/blackfire-php_1.54.0-darwin_amd64-php80.tar.gz ######################################################################## 100.0% Error: An exception occurred within a child process: Utils::Inreplace::Error: inreplace failed /usr/local/etc/php/8.0/conf.d/ext-blackfire.ini: expected replacement of /^(zend_)?extension=.+$/ with "extension=\"/usr/local/Cellar/blackfire-php80/1.54.0/blackfire.so\"" ``` --- Abstract/abstract-blackfire-php-extension.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Abstract/abstract-blackfire-php-extension.rb b/Abstract/abstract-blackfire-php-extension.rb index 2a85356..9b25506 100644 --- a/Abstract/abstract-blackfire-php-extension.rb +++ b/Abstract/abstract-blackfire-php-extension.rb @@ -164,7 +164,7 @@ def config_filepath def write_config_file if config_filepath.file? inreplace config_filepath do |s| - s.gsub!(/^(zend_)?extension=.+$/, "extension=\"#{module_path}\"") + s.gsub!(/^(;)?(zend_)?extension=.+$/, "extension=\"#{module_path}\"") end elsif config_file config_scandir_path.mkpath From df04168588e09f139a563a0c09e8ebd36cb1e15d Mon Sep 17 00:00:00 2001 From: Alex Pavlov Date: Fri, 3 Sep 2021 10:53:57 +0300 Subject: [PATCH 2/2] Update Abstract/abstract-blackfire-php-extension.rb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jérémy Derussé --- Abstract/abstract-blackfire-php-extension.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Abstract/abstract-blackfire-php-extension.rb b/Abstract/abstract-blackfire-php-extension.rb index 9b25506..7200705 100644 --- a/Abstract/abstract-blackfire-php-extension.rb +++ b/Abstract/abstract-blackfire-php-extension.rb @@ -164,7 +164,7 @@ def config_filepath def write_config_file if config_filepath.file? inreplace config_filepath do |s| - s.gsub!(/^(;)?(zend_)?extension=.+$/, "extension=\"#{module_path}\"") + s.gsub!(/^(;\s*)?(zend_)?extension=.+$/, "extension=\"#{module_path}\"") end elsif config_file config_scandir_path.mkpath