fix usage of sed to support OSX and Linux

rjust · Jun 11, 2024 · a07e3d5 · a07e3d5
1 parent a56a3f3
commit a07e3d5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/framework/core/Project/JacksonDatabind.pm b/framework/core/Project/JacksonDatabind.pm
@@ -86,14 +86,14 @@ sub _post_checkout {
     my $log = `$cmd`;
     my $ret = $?;
     if ($ret == 0 && length($log) > 0) {
-        Utils::exec_cmd("grep -lR ' extends Module\$' $work_dir | xargs sed -i 's/ extends Module\$/ extends com.fasterxml.jackson.databind.Module/'", "Correct Module ambiguity 1") or die;
+        Utils::exec_cmd("grep -lR ' extends Module\$' $work_dir | xargs sed -i'' -e 's/ extends Module\$/ extends com.fasterxml.jackson.databind.Module/'", "Correct Module ambiguity 1") or die;
     }
 
     $cmd = "grep -lR ' Module ' $work_dir ";
     $log = `$cmd`;
     $ret = $?;
     if ($ret == 0 && length($log) > 0) {
-        Utils::exec_cmd("grep -lR ' Module ' $work_dir | xargs sed -i 's/ Module / com.fasterxml.jackson.databind.Module /'", "Correct Module ambiguity 2") or die;
+        Utils::exec_cmd("grep -lR ' Module ' $work_dir | xargs sed -i'' -e 's/ Module / com.fasterxml.jackson.databind.Module /'", "Correct Module ambiguity 2") or die;
     }
 
     my $project_dir = "$PROJECTS_DIR/$self->{pid}";

diff --git a/framework/core/Project/Mockito.pm b/framework/core/Project/Mockito.pm
@@ -74,7 +74,7 @@ sub _post_checkout {
     if ($vid == 21) {
         system("rm -rf $work_dir/buildSrc/src/main/groovy/org/mockito/release/notes");
         system("rm -rf $work_dir/buildSrc/src/test/groovy/org/mockito/release/notes");
-        system("sed -i '/apply.from:..gradle.release.gradle./d' $work_dir/build.gradle");
+        Utils::sed_cmd("/apply.from:..gradle.release.gradle./d", "$work_dir/build.gradle");
     }
 
     # Change Url to Gradle distribution

diff --git a/framework/core/Utils.pm b/framework/core/Utils.pm
@@ -329,8 +329,9 @@ sub sed_cmd {
     print(STDERR "Executed command: sed -i $cmd_string $file_name\n") if $DEBUG;
 
     # We ignore sed result as it is ok if command fails.
-    if (`uname -s` eq "Darwin" ) {
-        `sed -i '' $cmd_string $file_name`;
+    chomp(my $uname = `uname -s`);
+    if ($uname eq "Darwin" ) {
+        `sed -i '' -e '$cmd_string' $file_name`;
     } else {
         `sed -i "$cmd_string" "$file_name"`;
     }