From acf5443a6826e6fe420fee2ac1a8c809edd5b6bc Mon Sep 17 00:00:00 2001 From: Zach Borboa Date: Thu, 16 Feb 2023 05:50:51 -0800 Subject: [PATCH] Fix sed command portability Error messages: $ sed -i'' '-e/->expectWarning(/d' ./PHPCurlClass/PHPCurlClassTest.php ./PHPCurlClass/PHPMultiCurlClassTest.php sed: 1: "./PHPCurlClass/PHPCurlC ...": invalid command code . + phpunit_v10_shim + remove_expectWarning + sed -i '' '-e/->expectWarning(/d' ./PHPCurlClass/PHPCurlClassTest.php ./PHPCurlClass/PHPMultiCurlClassTest.php sed: can't read : No such file or directory --- tests/ci.sh | 12 ++++++++++-- tests/run.sh | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/tests/ci.sh b/tests/ci.sh index 9a2d4f3..ce36042 100755 --- a/tests/ci.sh +++ b/tests/ci.sh @@ -1,6 +1,6 @@ remove_expectWarning() { # Fix "Call to undefined method CurlTest\CurlTest::expectWarning()". - sed -i'' -e"/->expectWarning(/d" "./PHPCurlClass/PHP"* + sed -i$(sed v < /dev/null 2> /dev/null || echo -n " ''") -e "/->expectWarning(/d" "./PHPCurlClass/PHP"* } replace_assertStringContainsString() { @@ -8,7 +8,15 @@ replace_assertStringContainsString() { # +->assertContains( find='->assertStringContainsString(' replace='->assertContains(' - sed -i'' -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"* + sed -i$(sed v < /dev/null 2> /dev/null || echo -n " ''") -e "s/${find}/${replace}/" "./PHPCurlClass/PHP"* +} + +replace_assertMatchesRegularExpression() { + # -->assertMatchesRegularExpression( + # +->assertRegExp( + find='->assertMatchesRegularExpression(' + replace='->assertRegExp(' + sed -i$(sed v < /dev/null 2> /dev/null || echo -n " ''") -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"* } phpunit_v6_5_shim() { diff --git a/tests/run.sh b/tests/run.sh index d1e3b8d..399cd6f 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -2,7 +2,7 @@ remove_expectWarning() { # Fix "Call to undefined method CurlTest\CurlTest::expectWarning()". - sed -i'' -e"/->expectWarning(/d" "./PHPCurlClass/PHP"* + sed -i$(sed v < /dev/null 2> /dev/null || echo -n " ''") -e "/->expectWarning(/d" "./PHPCurlClass/PHP"* } replace_assertStringContainsString() { @@ -10,7 +10,15 @@ replace_assertStringContainsString() { # +->assertContains( find='->assertStringContainsString(' replace='->assertContains(' - sed -i'' -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"* + sed -i$(sed v < /dev/null 2> /dev/null || echo -n " ''") -e "s/${find}/${replace}/" "./PHPCurlClass/PHP"* +} + +replace_assertMatchesRegularExpression() { + # -->assertMatchesRegularExpression( + # +->assertRegExp( + find='->assertMatchesRegularExpression(' + replace='->assertRegExp(' + sed -i$(sed v < /dev/null 2> /dev/null || echo -n " ''") -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"* } phpunit_v6_5_shim() {