diff --git a/ci-scripts/patch-fbthrift.sh b/ci-scripts/patch-fbthrift.sh index f5b2edb..2153004 100755 --- a/ci-scripts/patch-fbthrift.sh +++ b/ci-scripts/patch-fbthrift.sh @@ -61,15 +61,16 @@ if [[ "$OSTYPE" == "msys" ]]; then sbst="if (false) { \/* tebako patched *\/" do_patch "$1/thrift/compiler/source_location.cc" "$re" "$sbst" - re="#include " + re="#include " + # shellcheck disable=SC2251 ! IFS= read -r -d '' sbst << EOM -#include - +#include \/* -- Start of tebako patch -- *\/ -#include +#include \/* -- End of tebako patch -- *\/ EOM + do_patch_multiline "$1/thrift/compiler/lib/cpp2/util.h" "$re" "$sbst" fi