Fix rebase issues

2022-10-16 12:46:09 -04:00
parent 9aee4b831f
commit ecdb4f64d9
4 changed files with 6 additions and 5 deletions
@@ -87,7 +87,8 @@ if [[ $ACTION == "init" ]]; then
  # Strip all #error lines
  IFS=$'\n'; set -f
  for fn in $( find $TEMP/config -type f -name "Configuration.h" ); do
-    $SED -i "20,30{/#error/d}" $fn
+    $SED -i~ -e "20,30{/#error/d}" "$fn"
+    rm "$fn~"
  done
  unset IFS; set +f