ObsidianMC/Obsidian
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[ci skip] Revert change to apatch script

Browse source
This commit is contained in:
Jason Penilla 2021-12-21 19:54:51 -08:00
parent 264b11d9f3
commit a6a6a3db24
No known key found for this signature in database
GPG key ID: 0E75A301420E48F8
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/apatch.sh
View file

@ -40,7 +40,7 @@ fi
for i in $(find . -name \*.rej); do for i in $(find . -name \*.rej); do
base=$(echo "$i" | sed 's/.rej//g') base=$(echo "$i" | sed 's/.rej//g')
if [ -f "$i" ]; then if [ -f "$i" ]; then
sed -e 's/^diff a\/\(.*\) b\/\(.*\)[[:space:]].*rejected.*$/--- \1\n+++ \2/' -i '' $i && wiggle -v -l --replace "$base" "$i" sed -e 's/^diff a\/\(.*\) b\/\(.*\)[[:space:]].*rejected.*$/--- \1\n+++ \2/' -i $i && wiggle -v -l --replace "$base" "$i"
rm "$base.porig" "$i" rm "$base.porig" "$i"
else else
echo "No such file: $base" echo "No such file: $base"