patch-1.3.69 linux/scripts/patch-kernel

• Lines: 21
• Date: Sun Feb 25 11:17:59 1996
• Orig file: v1.3.68/linux/scripts/patch-kernel
• Orig date: Wed Feb 7 15:11:46 1996

diff -u --recursive --new-file v1.3.68/linux/scripts/patch-kernel linux/scripts/patch-kernel
@@ -36,13 +36,16 @@
     fi
 
     echo "Applying $patch..."
-    gunzip -dc $patchdir/$patch | patch -p1 -s -E -d $sourcedir
-# used to be patch -p1 -s -E -f -d $sourcedir
-    if [ "`find $sourcedir -name \*.rej -print`" ]
+    if (gunzip -dc $patchdir/$patch | grep -v '^\\' | patch -p1 -s -E -d $sourcedir)
+    then
+        echo "Patch failed.  Clean up yourself."
+        break
+    fi
+    if [ "`find $sourcedir '(' -name '*.rej' -o -name '.*.rej' ')' -print`" ]
     then
         echo "Aborting.  Reject files found."
         break
     fi
     # Remove backup files
-    find $sourcedir -name \*.orig -print | xargs rm -f
+    find $sourcedir '(' -name '*.orig' -o -name '.*.orig' ')' -print | xargs rm -f
 done