diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2003-03-22 11:34:14 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2003-03-22 11:34:14 +0000 |
| commit | a99811be10ebb871f1e458fd3692540efac27106 (patch) | |
| tree | 74165b500bc461bccaab425a7fd13493f2532055 /scripts/rpatch.in | |
| parent | 4e48fd5a6c8218e491ef3536121aae3c7a157ed6 (diff) | |
| download | quilt-a99811be10ebb871f1e458fd3692540efac27106.tar.gz | |
- Also substitute @SED@ and @AWK@.
- Some versions of sed don't like '\t'. Expand those in the
shell instead.
Diffstat (limited to 'scripts/rpatch.in')
| -rwxr-xr-x | scripts/rpatch.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/rpatch.in b/scripts/rpatch.in index 9c087f8..bba3dfe 100755 --- a/scripts/rpatch.in +++ b/scripts/rpatch.in @@ -45,8 +45,8 @@ verify_removal() fi @DIFF@ -Nu $DIFF_OPTS $bup $file \ - | sed -e 's:^--- [^ \t]*:--- '"$dir/$file.orig"':' \ - -e 's:^+++ [^ \t]*:+++ '"$dir/$file"':' + | @SED@ -e 's:^--- [^ '$'\t'']*:--- '"$dir/$file.orig"':' \ + -e 's:^+++ [^ '$'\t'']*:+++ '"$dir/$file"':' status=1 done @@ -92,7 +92,7 @@ rollback_patch() local patch=$1 pc_file=$(pc_file_name $patch) @LIB@/backup-files $silent_unless_verbose \ -f $pc_file -z ~rpatch -r - rm -f $(files_in_patch $patch | sed -e 's/$/\.rej/') + rm -f $(files_in_patch $patch | @SED@ -e 's/$/\.rej/') } interrupt() |