ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Sed Regex Escaping for Extended Regex Rules......

Browse Source
This commit is contained in:
W. Felix Handte
2020-05-05 14:54:04 -04:00
parent bdfb50f7c4
commit 005ffd3bdb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/single_file_libs/combine.sh
+2 -2
View File
@@ -46,7 +46,7 @@ test_deps() {
echo "Aborting: the grep implementation fails to parse include lines" echo "Aborting: the grep implementation fails to parse include lines"
exit 1 exit 1
fi fi
if ! echo '"foo.h"' | sed 's/"\([^"]\+\)"/\1/' | grep -Eq '^foo\.h$'; then if ! echo '"foo.h"' | sed -E 's/"([^"]+)"/\1/' | grep -Eq '^foo\.h$'; then
echo "Aborting: sed is unavailable or non-functional" echo "Aborting: sed is unavailable or non-functional"
exit 1 exit 1
fi fi
@@ -120,7 +120,7 @@ add_file() {
while IFS= read -r line; do while IFS= read -r line; do
if echo "$line" | grep -Eq '^\s*#\s*include\s*".+"'; then if echo "$line" | grep -Eq '^\s*#\s*include\s*".+"'; then
# We have an include directive so strip the (first) file # We have an include directive so strip the (first) file
local inc=$(echo "$line" | grep -Eo '".*"' | sed 's/"\([^"]\+\)"/\1/' | head -1) local inc=$(echo "$line" | grep -Eo '".*"' | sed -E 's/"([^"]+)"/\1/' | head -1)
local res_inc="$(resolve_include "$srcdir" "$inc")" local res_inc="$(resolve_include "$srcdir" "$inc")"
if list_has_item "$XINCS" "$inc"; then if list_has_item "$XINCS" "$inc"; then
# The file was excluded so error if the source attempts to use it # The file was excluded so error if the source attempts to use it