From 44e44755e3732cf5818543bd38f3a5c081605b6b Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Wed, 27 Oct 2004 03:27:38 +0000 Subject: [PATCH] Clifford Wolf: Switch Create-Diff output to use ./ filename prefixes .. so it can be used with patch -p0 and patch -p1 [2004101515155805848] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4596 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- scripts/Create-Diff | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/Create-Diff b/scripts/Create-Diff index 25792abb9..baa633190 100755 --- a/scripts/Create-Diff +++ b/scripts/Create-Diff @@ -67,9 +67,9 @@ for x in $directories ; do fi diff -x CVS -x '.svn' -x '.#*' -x '*.mine' -x '*.r[1-9][0-9]*' \ $FLAGS "$olddir"/$name_for_diff "$newdir"/$name_for_diff | grep -v '^diff ' | \ - sed "s,^--- $olddir/$source_for_sed,--- rock-old/$target_for_sed," | \ - sed "s,^+++ $newdir/$source_for_sed,+++ rock-new/$target_for_sed," | \ - perl -pe '$fn=$1 if /^--- rock-old\/(\S+)\s/; + sed "s,^--- $olddir/$source_for_sed,--- ./$target_for_sed," | \ + sed "s,^+++ $newdir/$source_for_sed,+++ ./$target_for_sed," | \ + perl -pe '$fn=$1 if /^--- \.\/(\S+)\s/; $_="" if $fn eq "Documentation/FAQ"; $_="" if $fn eq "Documentation/LSM"; $_="" if $fn =~ /~$/'