summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2003-10-28 13:43:12 +0000
committerAndreas Gruenbacher <agruen@suse.de>2003-10-28 13:43:12 +0000
commit99d31b7f2ca0041cb7870c6ebecd44e3fc1700d4 (patch)
tree2df264a22531558dda35b7a3ef1e234f135aa499 /scripts
parentcaedb55f6e65a7895fc9eb5df032bcf6f6ea49ba (diff)
downloadquilt-99d31b7f2ca0041cb7870c6ebecd44e3fc1700d4.tar.gz
- Change name and semantics of PATCHSCRIPTS variable: Before, if
PATCHSCRIPTS was set, the patches were in $PATCHSCRIPTS/patches. Now, if QUILT_PATCHES is set, the patches are in $QUILT_PATCHES. QUILT_PATCHES defaults to "patches", like before.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/patchfns.in13
1 files changed, 4 insertions, 9 deletions
diff --git a/scripts/patchfns.in b/scripts/patchfns.in
index 2700614..e8f0808 100644
--- a/scripts/patchfns.in
+++ b/scripts/patchfns.in
@@ -15,12 +15,7 @@ then
. $HOME/.quiltrc
fi
-if [ -n "$PATCHSCRIPTS" ]
-then
- P=$PATCHSCRIPTS/
-else
- unset P
-fi
+: ${QUILT_PATCHES:=patches}
if [ -e .pc/series ]
then
@@ -29,7 +24,7 @@ elif [ -e series ]
then
SERIES=series
else
- SERIES=${P}patches/series
+ SERIES=$QUILT_PATCHES/series
fi
DB=".pc/applied-patches"
@@ -70,7 +65,7 @@ patch_file_name()
if [ -e $SERIES ]
then
@AWK@ '/^'"$(quote_re $patch)"'(|\.patch|\.diff?)(|\.gz|\.bz2)([ \t]|$)/ \
- { printf "'"$P"'patches/%s\n", $1
+ { printf "'"$QUILT_PATCHES"'/%s\n", $1
exit
}
' $SERIES
@@ -393,7 +388,7 @@ stripit()
then
echo $1 |
@SED@ -e 's/^\(\.\/\)*//' \
- -e 's/^'"$(quote_bre $P)"'patches\///' \
+ -e 's/^'"$(quote_bre $QUILT_PATCHES)"'\///' \
-e 's/\.gz$//' -e 's/\.bz2$//' \
-e 's/\.patch$//' -e 's/\.diff\?$//'
fi