X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-main;h=b2bf813ce09326125b78f28af009823b0f7da01c;hb=89649ec59bde756d011595e60b21e3ef8232ad06;hp=63d0c9325b51964b7742b3b1364c0204a5777ab1;hpb=386a1bf118f4c591027b47a6919f45aebc22c244;p=releases.git

diff --git a/deblob-main b/deblob-main
index 63d0c9325b51..b2bf813ce093 100755
--- a/deblob-main
+++ b/deblob-main
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2008-2012 Alexandre Oliva <lxoliva@fsfla.org>
+# Copyright (C) 2008-2014 Alexandre Oliva <lxoliva@fsfla.org>
 
 # This program is part of GNU Linux-libre, a GNU project that
 # publishes scripts to clean up Linux so as to make it suitable for
@@ -271,35 +271,27 @@ xdelta3 -e -9 -S djw -s linux-$kver.tar linux-libre-$kver-$gnu.tar linux-libre-$
 echo Creating xdelta between linux-$kver.tar and linux-libre-$kver-$gnu.tar
 xdelta delta -0 linux-$kver.tar linux-libre-$kver-$gnu.tar linux-libre-$kver-$gnu.xdelta || : # xdelta returns nonzero on success
 
+cleanup="linux-libre-$kver-$gnu.tar linux-libre-$kver-$gnu.xdelta"
+
 echo Compressing binary deltas and linux-libre-$kver-$gnu.tar
 rm -f linux-$kver.tar
-if test -f linux-libre-$kver-$gnu.vcdiff; then
-  bzip2 -k9 linux-libre-$kver-$gnu.vcdiff
-  xz -k9 linux-libre-$kver-$gnu.vcdiff || :
-  lzip -k9 linux-libre-$kver-$gnu.vcdiff || :
-  rm -f linux-libre-$kver-$gnu.vcdiff
-fi
 if test -f linux-libre-$kver-$gnu.xdelta; then
   bzip2 -k9 linux-libre-$kver-$gnu.xdelta
   xz -k9 linux-libre-$kver-$gnu.xdelta || :
   lzip -k9 linux-libre-$kver-$gnu.xdelta || :
-  rm -f linux-libre-$kver-$gnu.xdelta
 fi
 bzip2 -k9 linux-libre-$kver-$gnu.tar
 xz -k9 linux-libre-$kver-$gnu.tar || :
 lzip -k9 linux-libre-$kver-$gnu.tar || :
 
-cleanup=linux-libre-$kver-$gnu.tar
-
 echo Done except for signing, feel free to interrupt
 for f in \
   linux-libre-$kver-$gnu.tar \
   linux-libre-$kver-$gnu.tar.bz2 \
   linux-libre-$kver-$gnu.tar.xz \
   linux-libre-$kver-$gnu.tar.lz \
-  linux-libre-$kver-$gnu.vcdiff.bz2 \
-  linux-libre-$kver-$gnu.vcdiff.xz \
-  linux-libre-$kver-$gnu.vcdiff.lz \
+  linux-libre-$kver-$gnu.vcdiff \
+  linux-libre-$kver-$gnu.xdelta \
   linux-libre-$kver-$gnu.xdelta.bz2 \
   linux-libre-$kver-$gnu.xdelta.xz \
   linux-libre-$kver-$gnu.xdelta.lz \
@@ -310,8 +302,7 @@ for f in \
   fi
 done
 
-rm -f linux-libre-$kver-$gnu.tar
-
+rm -f $cleanup
 cleanup=
 trap 'status=$?; (exit $status); exit' 0 1 2 15