From 609a0dac541590a2ae64100d56c35a4a2cb97e2e Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Thu, 15 Jun 2017 21:03:44 -0700 Subject: [PATCH] CRM-20561 - net-smtp-fix.sh - Cleanup code style --- tools/scripts/composer/net-smtp-fix.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/scripts/composer/net-smtp-fix.sh b/tools/scripts/composer/net-smtp-fix.sh index 71dd98b8ed..7e4b688315 100755 --- a/tools/scripts/composer/net-smtp-fix.sh +++ b/tools/scripts/composer/net-smtp-fix.sh @@ -27,16 +27,16 @@ function safe_delete() { ############################################################################## # Add in CiviCRM custom error message for CRM-8744. if ! grep -q 'CRM-8744' vendor/pear/net_smtp/Net/SMTP.php; then -patch vendor/pear/net_smtp/Net/SMTP.php < tools/scripts/composer/patches/net-smtp-patch.txt + patch vendor/pear/net_smtp/Net/SMTP.php < tools/scripts/composer/patches/net-smtp-patch.txt fi if ! grep -q '@STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT' vendor/pear/net_smtp/Net/SMTP.php; then -patch vendor/pear/net_smtp/Net/SMTP.php < tools/scripts/composer/patches/net-smtp-tls-patch.txt + patch vendor/pear/net_smtp/Net/SMTP.php < tools/scripts/composer/patches/net-smtp-tls-patch.txt fi if ! grep -q 'function __construct' vendor/pear/net_smtp/Net/SMTP.php; then -patch vendor/pear/net_smtp/Net/SMTP.php < tools/scripts/composer/patches/net-smtp-php7-patch.txt + patch vendor/pear/net_smtp/Net/SMTP.php < tools/scripts/composer/patches/net-smtp-php7-patch.txt fi if grep -q '&Auth_SASL::factory' vendor/pear/net_smtp/Net/SMTP.php; then -patch vendor/pear/net_smtp/Net/SMTP.php < tools/scripts/composer/patches/net-smtp-ref-patch.txt + patch vendor/pear/net_smtp/Net/SMTP.php < tools/scripts/composer/patches/net-smtp-ref-patch.txt fi safe_delete vendor/pear/net_smtp/{examples,phpdoc.sh,tests} -- 2.25.1