From: lxoliva <lxoliva@559672b5-ba27-0410-b829-e8f1faed8b1b>
Date: Mon, 19 May 2008 00:56:29 +0000 (+0000)
Subject: Fix quoting of parentheses.  Don't match stuff after the optional
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=f6f6817922aa96c3f833fd6e2de8e5358306b068;p=releases.git

Fix quoting of parentheses.  Don't match stuff after the optional
slash in 'Only in' diff lines.  Error out on errors.


git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@3559 559672b5-ba27-0410-b829-e8f1faed8b1b
---

diff --git a/deblob-main b/deblob-main
index d64b3bb1102..4e5372c38da 100755
--- a/deblob-main
+++ b/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