diff options
| author | Alexandre Oliva <lxoliva@fsfla.org> | 2008-05-19 00:56:29 +0000 |
|---|---|---|
| committer | Alexandre Oliva <lxoliva@fsfla.org> | 2008-05-19 00:56:29 +0000 |
| commit | 3c9935e4de94e9886e59664c4bf97e88f3fd849b (patch) | |
| tree | 4be70df3a61d4764afe0a9a2c2da95ba6015bc0a /scripts/deblob-main | |
| parent | 9063ebe8bd4981be71ae6d73c9b099dc91d010e4 (diff) | |
| download | linux-libre-raptor-3c9935e4de94e9886e59664c4bf97e88f3fd849b.tar.gz linux-libre-raptor-3c9935e4de94e9886e59664c4bf97e88f3fd849b.zip | |
Fix quoting of parentheses. Don't match stuff after the optional
slash in 'Only in' diff lines. Error out on errors.
Diffstat (limited to 'scripts/deblob-main')
| -rwxr-xr-x | scripts/deblob-main | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/deblob-main b/scripts/deblob-main index d64b3bb11..4e5372c38 100755 --- a/scripts/deblob-main +++ b/scripts/deblob-main @@ -147,6 +147,8 @@ fi trap "status=$?; echo cleaning up...; rm -rf orig-linux-$kver linux-$kver linux-$kver-$libre linux-$kver.tar linux-$kver-$libre.tar linux-$kver-$libre.tar.bz2 linux-$kver-$libre.patch linux-$kver-$libre.xdelta; (exit $status); exit" 0 1 2 15 +set -e + echo Uncompressing linux-$kver.tar.bz2 into linux-$kver.tar rm -rf linux-$kver linux-$kver.tar bunzip2 < linux-$kver.tar.bz2 > linux-$kver.tar @@ -171,8 +173,8 @@ diff -druN linux-$kver linux-$kver-$libre > linux-$kver-$libre.patch echo Removing removed or modified files from linux-$kver-$libre.tar diff -rq linux-$kver linux-$kver-$libre | sed -n " - s,^Only in \(linux-$kver/\?.*\): \(.*\),\1/\2,p; - s,^Files \(linux-$kver\)/\(.*\) and \1-$libre/\2 differ,\1/\2,p; + s,^Only in \\(linux-$kver\\(/.*\\)\\?\\): \\(.*\\),\1/\3,p; + s,^Files \\(linux-$kver\\)/\\(.*\\) and \\1-$libre/\\2 differ,\\1/\\2,p; " | xargs tar --delete -f linux-$kver-$libre.tar @@ -182,8 +184,8 @@ mv linux-$kver orig-linux-$kver mv linux-$kver-$libre linux-$kver diff -rq orig-linux-$kver linux-$kver | sed -n " - s,^Files orig-\(linux-$kver/.*\) and \1 differ,\1,p; - s,^Only in \(linux-$kver/?.*\): \(.*\),\1/\2,p; + s,^Files orig-\\(linux-$kver/.*\\) and \\1 differ,\\1,p; + s,^Only in \\(linux-$kver\\(/.*\\)\\?\\): \\(.*\\),\\1/\\3,p; " | xargs tar --append -f linux-$kver-$libre.tar |
