X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=deblob-main;h=3a85cdc9630b0e91d04343a0bc446b9bf8fb77a1;hb=9e496cc4bbdcc1e30399af85c3fcaff57d1d3fc8;hp=6ec8e69bf38d8e93475dd8e2a65eac941781fb5b;hpb=ff55b862a01caaff63f6e5df94162e25b6b06ef5;p=librecmc%2Flinux-libre.git

diff --git a/deblob-main b/deblob-main
index 6ec8e69bf38..3a85cdc9630 100755
--- a/deblob-main
+++ b/deblob-main
@@ -74,6 +74,10 @@ case $1 in
 *) force=;;
 esac
 
+# We don't want e.g. diff output translations to affect us.
+LC_ALL=C; export LC_ALL
+LANGUAGE=C; export LANGUAGE
+
 mver=$1 extra=$2 sver=$3
 kver=$mver$sver gnu=gnu$extra
 deblob= dir=`echo "$0" | sed 's,[^/]*$,,;s,^$,.,;s,/*$,,'`
@@ -267,35 +271,35 @@ 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.vcdiff 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 \
   linux-libre-$kver-$gnu.vcdiff.bz2 \
   linux-libre-$kver-$gnu.vcdiff.xz \
   linux-libre-$kver-$gnu.vcdiff.lz \
+  linux-libre-$kver-$gnu.xdelta \
   linux-libre-$kver-$gnu.xdelta.bz2 \
   linux-libre-$kver-$gnu.xdelta.xz \
   linux-libre-$kver-$gnu.xdelta.lz \
@@ -306,8 +310,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