Skip to content

pm_apply: Do not quote "+" for BREs #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 20, 2022
Merged

pm_apply: Do not quote "+" for BREs #242

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c227a91
pm_apply: Do not quote "+" for BREs
Olf0 Jan 19, 2022
55cd529
pm_apply: Replace all occurrences of each path pattern
Olf0 Jan 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/tools/pm_apply
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ mangle_libpath() {
sedcmd=""
# look for lines to convert, if some are found add pattern to sed scriptlet
for p in $candidates; do
cand_lines=$(grep -c "^\+\+\+ [^/]*$p" "$PATCH_PATH")
cand_lines=$(grep -c "^+++ [^/]*$p" "$PATCH_PATH")
if [ $cand_lines -eq 0 ]; then
continue # nothing found, try next
fi
Expand All @@ -118,7 +118,7 @@ mangle_libpath() {
failure
fi
# append at the front so ';' can be easily used for separation
sedcmd="s@^\+\+\+ \([^/]*\)$p@+++ \1$pr@;s@^--- \([^/]*\)$p@--- \1$pr@;$sedcmd"
sedcmd="s@^+++ \([^/]*\)$p@+++ \1$pr@g;s@^--- \([^/]*\)$p@--- \1$pr@g;$sedcmd"
done

if [ $found -eq 0 ]; then
Expand Down