Adjustments to accept patch-3.6-gnu-3.7-rc6-gnu and its reverse.

[releases.git] / deblob-main

diff --git a/deblob-main b/deblob-main
index 656e2a4f36ad753c6e5694c1cccf4d01f6752362..63d0c9325b51964b7742b3b1364c0204a5777ab1 100755 (executable)
--- 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,/*$,,'`
@@ -199,7 +203,7 @@ else
   fi
 fi
 
-trap "status=$?; echo cleaning up...; rm -rf $cleanup; (exit $status); exit" 0 1 2 15
+trap 'status=$?; echo cleaning up...; rm -rf $cleanup; (exit $status); exit' 0 1 2 15
 
 set -e
 
@@ -309,7 +313,7 @@ done
 rm -f linux-libre-$kver-$gnu.tar
 
 cleanup=
-trap "status=$?; (exit $status); exit" 0 1 2 15
+trap 'status=$?; (exit $status); exit' 0 1 2 15
 
 echo All set, please review linux-libre-$kver-$gnu.patch