ptrcnull/apatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix: allow for using busybox grep

Browse source
This commit is contained in:
ptrcnull 2022-07-30 09:25:54 +02:00
parent 8efb7c51b1
commit 53441cb0fb
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apatch
View file

@ -81,7 +81,7 @@ fi
# if file exists, try to apply # if file exists, try to apply
if [ -e "$patchpath" ]; then if [ -e "$patchpath" ]; then
git apply --reject --whitespace=fix "$patchpath" || { git apply --reject --whitespace=fix "$patchpath" || {
rejects="$(git status --porcelain | grep '\?\? .*\.rej$' | cut -c4-)" rejects="$(git status --porcelain | grep -F '??' | grep -F '.rej' | cut -c4-)"
if [ -n "$rejects" ]; then if [ -n "$rejects" ]; then
warning "$1 partially applied with rejects" warning "$1 partially applied with rejects"
for reject in $rejects; do for reject in $rejects; do