diff options
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/apatch.in | 6 | ||||
| -rw-r--r-- | lib/patchfns.in | 2 | ||||
| -rwxr-xr-x | lib/rpatch.in | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/lib/apatch.in b/lib/apatch.in index 593b32f..e737255 100755 --- a/lib/apatch.in +++ b/lib/apatch.in @@ -55,15 +55,15 @@ apply_patch() if [ "x${patch_file:(-3)}" = "x.gz" ] then gzip -cd $patch_file \ - | patch $(patch_args $patch) --no-backup-if-mismatch \ + | @PATCH@ $(patch_args $patch) --no-backup-if-mismatch \ -E $silent elif [ "x${patch_file:(-4)}" = "x.bz2" ] then bzip2 -cd $patch_file \ - | patch $(patch_args $patch) --no-backup-if-mismatch \ + | @PATCH@ $(patch_args $patch) --no-backup-if-mismatch \ -E $silent else - patch $(patch_args $patch) --no-backup-if-mismatch \ + @PATCH@ $(patch_args $patch) --no-backup-if-mismatch \ -E $silent -i $patch_file fi } diff --git a/lib/patchfns.in b/lib/patchfns.in index b4123c9..e5be4f5 100644 --- a/lib/patchfns.in +++ b/lib/patchfns.in @@ -528,7 +528,7 @@ diff_file() fi echo Index: $new_hdr - diff -Nu $DIFF_OPTS $old_file $new_file | + @DIFF@ -Nu $DIFF_OPTS $old_file $new_file | fix_diff_header $old_hdr $new_hdr } diff --git a/lib/rpatch.in b/lib/rpatch.in index 2d39bf1..73f8ac6 100755 --- a/lib/rpatch.in +++ b/lib/rpatch.in @@ -44,7 +44,7 @@ verify_removal() echo "Patch does not remove changes:" fi - diff -Nu $DIFF_OPTS $bup $file \ + @DIFF@ -Nu $DIFF_OPTS $bup $file \ | sed -e 's:^--- [^ \t]*:--- '"$dir/$file.orig"':' \ -e 's:^+++ [^ \t]*:+++ '"$dir/$file"':' @@ -117,15 +117,15 @@ reverse_patch() if [ "x${patch_file:(-3)}" = "x.gz" ] then gzip -cd $patch_file \ - | patch $(patch_args $patch) --no-backup-if-mismatch \ + | @PATCH@ $(patch_args $patch) --no-backup-if-mismatch \ -R -E $silent elif [ "x${patch_file:(-4)}" = "x.bz2" ] then bzip2 -cd $patch_file \ - | patch $(patch_args $patch) --no-backup-if-mismatch \ + | @PATCH@ $(patch_args $patch) --no-backup-if-mismatch \ -R -E $silent else - patch $(patch_args $patch) --no-backup-if-mismatch \ + @PATCH@ $(patch_args $patch) --no-backup-if-mismatch \ -R -E $silent -i $patch_file fi } |