Browse Source

change to from p0 to -p1

pull/19/head
root 5 years ago
parent
commit
5debd8df2d
  1. 19
      support/functions/_patch

19
support/functions/_patch

@ -38,7 +38,7 @@ _apply_menupatch(){
_w="ok"
cd "$svndir"
printf "PATCH : apply $e"
patch -f -p0 < "$pdir/$e" >>"$patchlog" 2>/dev/null
patch -f -p1 < "$pdir/$e" >>"$patchlog" 2>/dev/null
hunks=$(grep -c1 '^Hunk' "$patchlog")
fails=$(grep -c1 'hunks FAILED' "$patchlog")
@ -77,21 +77,6 @@ _apply_menupatch(){
sleep 2
}
_checkpatch(){
files_to_patch=$(grep "^+++ " -i $pdir/$1 | awk '{print $2}' | sort | uniq)
for fil in ${files_to_patch[@]}
do
if [ ! -f "$svndir/$fil" ]
then
fil_n=$(sed 's@^[^/]*/@@g' <<<"$fil")
sed -i "s@+++ $fil@+++ $fil_n@g" "$pdir/$1"
fi
done
}
_apply_consolepatch(){
if [ ! -f "$workdir/SVN-IS-PATCHED" ]
then
@ -110,7 +95,7 @@ _apply_consolepatch(){
_w=0
cd "$svndir"
printf "$y_l\n | PATCH : apply $e"
patch -F 10 -f -p0 < "$pdir/$e" >>"$patchlog" 2>/dev/null
patch -F 10 -f -p1 < "$pdir/$e" >>"$patchlog" 2>/dev/null
hunks=$(grep -c1 "^Hunk" "$patchlog")
fails=$(grep -c1 "hunks FAILED" "$patchlog")

Loading…
Cancel
Save