summaryrefslogtreecommitdiffstats
path: root/scripts/patchfns.in
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2003-05-16 18:46:30 +0000
committerAndreas Gruenbacher <agruen@suse.de>2003-05-16 18:46:30 +0000
commit9aac3d3f9c74a0d0ecfdbb483511352120a01b97 (patch)
treec3fb3e187e531854a592fabda11638f96a6ca9b4 /scripts/patchfns.in
parent0e5e23c57d4c19de54f52c5305f3ffc9c932ab0a (diff)
downloadquilt-9aac3d3f9c74a0d0ecfdbb483511352120a01b97.tar.gz
- Rename DIFF_OPTS environment variable to QUILT_DIFF_OPTS
- Add ~/.quiltrc resource file (this file is sourced from the patchfsn file, which is used by all commands).
Diffstat (limited to 'scripts/patchfns.in')
-rw-r--r--scripts/patchfns.in7
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/patchfns.in b/scripts/patchfns.in
index 011338b..e2daff8 100644
--- a/scripts/patchfns.in
+++ b/scripts/patchfns.in
@@ -10,6 +10,11 @@
export TEXTDOMAIN=quilt
+if [ -e $HOME/.quiltrc ]
+then
+ . $HOME/.quiltrc
+fi
+
if [ -n "$PATCHSCRIPTS" ]
then
P=$PATCHSCRIPTS/
@@ -551,7 +556,7 @@ diff_file()
new_hdr=$dir/$file
fi
- @DIFF@ -Nu $DIFF_OPTS $old_file $new_file |
+ @DIFF@ -Nu $QUILT_DIFF_OPTS $old_file $new_file |
if read line
then
echo "Index: $new_hdr"