#! /bin/sh
-# Copyright (C) 2008, 2009 Alexandre Oliva <lxoliva@fsfla.org>
+# Copyright (C) 2008, 2009, 2010 Alexandre Oliva <lxoliva@fsfla.org>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
exit 1
fi
-if test -f linux-$kver-$libre.tar.bz2; then
- echo linux-$kver-$libre.tar.bz2 already exists >&2
- exit 1
-fi
-
-if test -f linux-$kver.tar; then
- echo linux-$kver.tar already exists >&2
- exit 1
-fi
-
-if test -f linux-$kver-$libre.tar; then
- echo linux-$kver-$libre.tar already exists >&2
- exit 1
-fi
-
-if test -f linux-$kver-$libre.patch; then
- echo linux-$kver-$libre.patch already exists >&2
- exit 1
-fi
-
-if test -f linux-$kver-$libre.log; then
- echo linux-$kver-$libre.log already exists >&2
- exit 1
-fi
-
-if test -f linux-$kver-$libre.xdelta; then
- echo linux-$kver-$libre.xdelta already exists >&2
- exit 1
-fi
-
-if test -d linux-$kver; then
- echo linux-$kver already exists >&2
- exit 1
-fi
-
-if test -d linux-$kver-$libre; then
- echo linux-$kver-$libre already exists >&2
- exit 1
-fi
-
-if test -d orig-linux-$kver; then
- echo orig-linux-$kver already exists >&2
- exit 1
-fi
+cleanup=
+
+for f in \
+ linux-$kver-$libre.tar.bz2 \
+ linux-$kver-$libre.tar.bz2.asc \
+ linux-$kver-$libre.tar.bz2.sign \
+ linux-$kver-$libre.tar.lz \
+ linux-$kver-$libre.tar.lz.asc \
+ linux-$kver-$libre.tar.lz.sign \
+ linux-$kver.tar \
+ linux-$kver-$libre.tar \
+ linux-$kver-$libre.patch \
+ linux-$kver-$libre.log \
+ linux-$kver-$libre.xdelta \
+ linux-$kver-$libre.xdelta.asc \
+ linux-$kver-$libre.xdelta.sign \
+; do
+ if test -f $f; then
+ echo $f already exists >&2
+ exit 1
+ fi
+ cleanup="$cleanup $f"
+done
+
+for d in \
+ linux-$kver \
+ linux-$kver-$libre \
+ orig-linux-$kver \
+; do
+ if test -d $d; then
+ echo $d already exists >&2
+ exit 1
+ fi
+ cleanup="$cleanup $d"
+done
if test -f $dir/deblob-$kver; then
if cmp $dir/deblob-$kver $deblob; then
fi
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
+trap "status=$?; echo cleaning up...; rm -rf $cleanup; (exit $status); exit" 0 1 2 15
set -e
rm -rf linux-$kver linux-$kver.tar
bunzip2 < linux-$kver.tar.bz2 > linux-$kver.tar
-echo Extracing linux-$kver.tar into linux-$kver
+echo Extracting linux-$kver.tar into linux-$kver
tar -xf linux-$kver.tar
rm -rf linux-$kver-$libre linux-$kver-$libre.tar
rm -f linux-$kver-$libre.log linux-$kver-$libre.log.tmp
echo Deblobbing within linux-$kver-$libre, saving output to linux-$kver-$libre.log
-# We can't just pipe deblob into tee, for then we fail to detect
+# We can't just pipe deblob into tee, for then we fail to detect
# error conditions. Use file renaming to tell whether we succeeded.
if (cd linux-$kver-$libre && /bin/sh ../$deblob $force) 2>&1; then
mv linux-$kver-$libre.log.tmp linux-$kver-$libre.log
echo Compressing linux-$kver-$libre.tar and linux-$kver-$libre.xdelta
rm -f linux-$kver.tar
+lzip -k9 linux-$kver-$libre.tar
bzip2 -9 linux-$kver-$libre.tar
if test -f linux-$kver-$libre.xdelta; then
+ lzip -k9 linux-$kver-$libre.xdelta
bzip2 -9 linux-$kver-$libre.xdelta
fi
trap "status=$?; (exit $status); exit" 0 1 2 15
echo Done except for signing, feel free to interrupt
-gpg -a --detach-sign linux-$kver-$libre.tar.bz2
-mv linux-$kver-$libre.tar.bz2.asc linux-$kver-$libre.tar.bz2.sign
-
-if test -f linux-$kver-$libre.xdelta.bz2; then
- gpg -a --detach-sign linux-$kver-$libre.xdelta.bz2
- mv linux-$kver-$libre.xdelta.bz2.asc linux-$kver-$libre.xdelta.bz2.sign
-fi
+for f in \
+ linux-$kver-$libre.tar.bz2 \
+ linux-$kver-$libre.tar.lz \
+ linux-$kver-$libre.xdelta.bz2 \
+ linux-$kver-$libre.xdelta.lz \
+; do
+ if test -f $f; then
+ gpg -a --detach-sign $f
+ mv $f.asc $f.sign
+ fi
+done
echo All set, please review linux-$kver-$libre.patch