From 3971c2f08182e4206d8d373ee4afdc288ec60c00 Mon Sep 17 00:00:00 2001 From: Zach Borboa Date: Fri, 10 Mar 2023 04:31:11 -0800 Subject: [PATCH] Fix sed portability --- tests/ci.sh | 24 ++++++++++++++++++++---- tests/run.sh | 24 ++++++++++++++++++++---- 2 files changed, 40 insertions(+), 8 deletions(-) diff --git a/tests/ci.sh b/tests/ci.sh index bb6f0cf..726fda8 100755 --- a/tests/ci.sh +++ b/tests/ci.sh @@ -2,7 +2,11 @@ remove_expectWarning() { # Fix "Call to undefined method CurlTest\CurlTest::expectWarning()". - sed -i$(sed v < /dev/null 2> /dev/null || echo -n " ''") -e "/->expectWarning(/d" "./PHPCurlClass/PHP"* + if sed v < /dev/null 2> /dev/null; then + sed -i"" -e "/->expectWarning(/d" "./PHPCurlClass/PHP"* + else + sed -i "" -e "/->expectWarning(/d" "./PHPCurlClass/PHP"* + fi } replace_assertStringContainsString() { @@ -10,7 +14,11 @@ replace_assertStringContainsString() { # +->assertContains( find='->assertStringContainsString(' replace='->assertContains(' - sed -i$(sed v < /dev/null 2> /dev/null || echo -n " ''") -e "s/${find}/${replace}/" "./PHPCurlClass/PHP"* + if sed v < /dev/null 2> /dev/null; then + sed -i"" -e "s/${find}/${replace}/" "./PHPCurlClass/PHP"* + else + sed -i "" -e "s/${find}/${replace}/" "./PHPCurlClass/PHP"* + fi } replace_assertMatchesRegularExpression() { @@ -18,7 +26,11 @@ replace_assertMatchesRegularExpression() { # +->assertRegExp( find='->assertMatchesRegularExpression(' replace='->assertRegExp(' - sed -i$(sed v < /dev/null 2> /dev/null || echo -n " ''") -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"* + if sed v < /dev/null 2> /dev/null; then + sed -i"" -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"* + else + sed -i "" -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"* + fi } phpunit_v6_5_shim() { @@ -50,7 +62,11 @@ php_v7_0_shim() { # +protected function setUp() find='protected function setUp(): void' replace='protected function setUp()' - sed -i'' -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"* + if sed v < /dev/null 2> /dev/null; then + sed -i"" -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"* + else + sed -i "" -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"* + fi } set -x diff --git a/tests/run.sh b/tests/run.sh index d3745cd..c3472fe 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -2,7 +2,11 @@ remove_expectWarning() { # Fix "Call to undefined method CurlTest\CurlTest::expectWarning()". - sed -i$(sed v < /dev/null 2> /dev/null || echo -n " ''") -e "/->expectWarning(/d" "./PHPCurlClass/PHP"* + if sed v < /dev/null 2> /dev/null; then + sed -i"" -e "/->expectWarning(/d" "./PHPCurlClass/PHP"* + else + sed -i "" -e "/->expectWarning(/d" "./PHPCurlClass/PHP"* + fi } replace_assertStringContainsString() { @@ -10,7 +14,11 @@ replace_assertStringContainsString() { # +->assertContains( find='->assertStringContainsString(' replace='->assertContains(' - sed -i$(sed v < /dev/null 2> /dev/null || echo -n " ''") -e "s/${find}/${replace}/" "./PHPCurlClass/PHP"* + if sed v < /dev/null 2> /dev/null; then + sed -i"" -e "s/${find}/${replace}/" "./PHPCurlClass/PHP"* + else + sed -i "" -e "s/${find}/${replace}/" "./PHPCurlClass/PHP"* + fi } replace_assertMatchesRegularExpression() { @@ -18,7 +26,11 @@ replace_assertMatchesRegularExpression() { # +->assertRegExp( find='->assertMatchesRegularExpression(' replace='->assertRegExp(' - sed -i$(sed v < /dev/null 2> /dev/null || echo -n " ''") -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"* + if sed v < /dev/null 2> /dev/null; then + sed -i"" -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"* + else + sed -i "" -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"* + fi } phpunit_v6_5_shim() { @@ -50,7 +62,11 @@ php_v7_0_shim() { # +protected function setUp() find='protected function setUp(): void' replace='protected function setUp()' - sed -i'' -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"* + if sed v < /dev/null 2> /dev/null; then + sed -i"" -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"* + else + sed -i "" -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"* + fi } set -x