[Lldb-commits] [PATCH] D51374: [LLDB] Fix script to work with GNU sed

[Shoaib Meenai via Phabricator via lldb-commits]

smeenai created this revision.
smeenai added reviewers: beanz, davide, xiaobai.

GNU sed and BSD sed have a different command-line syntax for in-place
editing, and the current form of the script would only work with BSD
sed. The easiest way to get cross-platform behavior is to specify a
backup suffix and then just delete the backup file at the end. (BSD sed
is the default on macOS, but it's possible to acquire GNU coreutils and
have your `sed` be GNU sed even on macOS; I'm aware it's not officially
supported in any capacity, but it's easy enough to support here.)

An alternative would be using `perl -p -i -e` instead of `sed -i`, but I
figured it was best to make the minimal working change.


https://reviews.llvm.org/D51374

Files:
  scripts/framework-header-fix.sh


Index: scripts/framework-header-fix.sh
===================================================================
--- scripts/framework-header-fix.sh
+++ scripts/framework-header-fix.sh
@@ -2,12 +2,13 @@
 # Usage: framework-header-fix.sh <source header dir> <LLDB Version>
 for file in `find $1 -name "*.h"`
 do
-  sed -i '' 's/\(#include\)[ ]*"lldb\/\(API\/\)\{0,1\}\(.*\)"/\1 <LLDB\/\3>/1' "$file"
-  sed -i '' 's|<LLDB/Utility|<LLDB|' "$file"
+  sed -i.bak 's/\(#include\)[ ]*"lldb\/\(API\/\)\{0,1\}\(.*\)"/\1 <LLDB\/\3>/1' "$file"
+  sed -i.bak 's|<LLDB/Utility|<LLDB|' "$file"
   LLDB_VERSION=`echo $2 | /usr/bin/sed -E 's/^([0-9]+).([0-9]+).([0-9]+)(.[0-9]+)?$/\\1/g'`
   LLDB_REVISION=`echo $2 | /usr/bin/sed -E 's/^([0-9]+).([0-9]+).([0-9]+)(.[0-9]+)?$/\\3/g'`
   LLDB_VERSION_STRING=`echo $2`
-  sed -i '' "s|//#define LLDB_VERSION$|#define LLDB_VERSION $LLDB_VERSION |" "$file"
-  sed -i '' "s|//#define LLDB_REVISION|#define LLDB_REVISION $LLDB_REVISION |" "$file"
-  sed -i '' "s|//#define LLDB_VERSION_STRING|#define LLDB_VERSION_STRING \"$LLDB_VERSION_STRING\" |" "$file"
+  sed -i.bak "s|//#define LLDB_VERSION$|#define LLDB_VERSION $LLDB_VERSION |" "$file"
+  sed -i.bak "s|//#define LLDB_REVISION|#define LLDB_REVISION $LLDB_REVISION |" "$file"
+  sed -i.bak "s|//#define LLDB_VERSION_STRING|#define LLDB_VERSION_STRING \"$LLDB_VERSION_STRING\" |" "$file"
+  rm -f "$file.bak"
 done


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D51374.162928.patch
Type: text/x-patch
Size: 1393 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20180828/62c6730b/attachment.bin>