fix sed command; update patch

rjust · Jul 3, 2024 · da6150f · da6150f
1 parent 8b104bc
commit da6150f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/framework/core/Project/Lang.pm b/framework/core/Project/Lang.pm
@@ -95,14 +95,14 @@ sub _post_checkout {
     my $log = `$cmd`;
     my $ret = $?;
     if ($ret == 0 && length($log) > 0) {
-        Utils::exec_cmd("grep -lR '\.enum;' $work_dir'/'$result->{src}'/org/apache/commons/lang/enum/' | xargs sed -i'' 's/\.enum;/\.oldenum;/'", "Rename enum 1") or die;
+        Utils::exec_cmd("grep -lR '\\.enum;' $work_dir'/'$result->{src}'/org/apache/commons/lang/enum/' | xargs sed -i'' 's/\\.enum;/\\.oldenum;/'", "Rename enum 1") or die;
     }
 
     $cmd = "grep -lR '\.enum;' $work_dir'/'$result->{test}'/org/apache/commons/lang/enum/'";
     $log = `$cmd`;
     $ret = $?;
     if ($ret == 0 && length($log) > 0) {
-        Utils::exec_cmd("grep -lR '\.enum;' $work_dir'/'$result->{test}'/org/apache/commons/lang/enum/' | xargs sed -i'' 's/\.enum;/\.oldenum;/'", "Rename enum 2") or die;
+        Utils::exec_cmd("grep -lR '\\.enum;' $work_dir'/'$result->{test}'/org/apache/commons/lang/enum/' | xargs sed -i'' 's/\\.enum;/\\.oldenum;/'", "Rename enum 2") or die;
     }
 
     # Fix compilation errors if necessary

diff --git a/framework/projects/Lang/compile-errors/test-65-65.diff b/framework/projects/Lang/compile-errors/test-65-65.diff
@@ -7,7 +7,7 @@ index 38d578aba..a0ae9fc73 100644
          for (Iterator it = list.iterator(); it.hasNext();) {
 -            ValuedEnum enum = (ValuedEnum) it.next();
 -            if (enum.getValue() == value) {
--                return.oldenum;
+-                return enum;
 +            ValuedEnum enumer = (ValuedEnum) it.next();
 +            if (enumer.getValue() == value) {
 +                return enumer;