Fix message when copying directories. Ignore non-zero exit status in diff.

[releases.git] / deblob-main

diff --git a/deblob-main b/deblob-main
index d64b3bb11026c984e143788b61e3a84c32428210..f5dae770ad2c30c9fd1775f6e7800721cb84be43 100755 (executable)
--- 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
@@ -155,7 +157,7 @@ echo Extracing linux-$kver.tar into linux-$kver
 tar -xf linux-$kver.tar
 rm -rf linux-$kver-$libre linux-$kver-$libre.tar
 
-echo Copying linux-$kver to linux-$kver-$libre.tar
+echo Copying linux-$kver to linux-$kver-$libre
 cp linux-$kver.tar linux-$kver-$libre.tar
 cp -lR linux-$kver/. linux-$kver-$libre
 
@@ -166,13 +168,13 @@ rm -f linux-$kver-$libre.patch
 cp $0 $deblob deblob-check linux-$kver-$libre
 
 echo Generating linux-$kver-$libre.patch
-diff -druN linux-$kver linux-$kver-$libre > linux-$kver-$libre.patch
+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